Fix not removed merge conflicts