first commit after merge