attempted to fix conflicts
fixed factories.js
fixed conflicts
finished login registration