resolved merge issue with missing }