Git Push Pull Merge Commit