Git Pull Vs Merge