Clean merge conflicts