Commit after merge