Changed second line
Resolved merge conflict