fixed some omitted merge
ex1 mark
find a bug in user_mem_check and try getting fixed
ex2 mark