some branch change
conflicting branch change
the merge