Commit before the merge