new line
resolved merge