resolved merge with unit.c