commit after conflict
commit2