commit_after_merge