fixed things in createAccount
fixed merge errors