added account page - fixing merge conflict