adding redirect to /account
Merge error