commit after conflict