Added a conflict for example
Resolved merge conflict by putting both on one line