Commit before a merge