merge conflict c2 w2