first commit
second commit
resolved merge conflict