first commit
resolve first conflict