should conflict
commit after conflict