Git Pull Does Merge