corrected proc kill all
resolved merge issues in proc.c