Clarify merge conflicts