commit basic file
Commit new text file
commit conflict file
Commit resolved file