Remove merge conflict duplications