Changed line 2 of file
resolved merge conflict