modify only second line in secondary dir
resolved merge by including second line change on top of 3 line change