commit after mass conflict