resolved merge in my.c