Clean merge conflict