merge

change user name in kernel