session routes
conflict
users updated
added 'add_index' to migration
Merged files