commit after conflict
commit after conflict