結果 : git merge keep current changes