merge AccountController