updated slug_mem.c
resolved conflict