Clarify merge conflict resolution section