first conflict
commit after conflict