結果 : difference between git pull and merge