resolved merge issues in proc.c