added admin account
fixed merge error