commit after merge failed