added first admin function
added first admin function and fixed merge