Remove conflict in merging