controller fix
accounts merge fix