Git Merge Two Commits Into One Commit