Standard Git Commit Merge