結果 : git merge changes not staged for commit