結果 : git pull automatic merge failed fix conflicts and then commit the result