Dealing with merge conflict