clean merge conflicts