Fix wrong manual merges