example commit
resolved merge conflict