changed links, added pages
fixed conflicts
fixed matched user helpers