Fixed conflicts generated by the previous version merging