resolving edit/welcome