Git Commit Merge