commit after merge