user/edit has syntax error
temporary navbar view fix
merge conflict user edit pg