Git Commit After Merge