Merging my current file
Resolved merge conflicts