fix up some merge errors in process.c