結果 : git merge accept their changes