first commit second man
second commit second man
conflict resolved