memcontrol.c

fix merge errors