Git Merge 2 Commits