結果 : change git pull merge strategy