clean merge conflict