user and session controllers done
 merges round 1 completed
 merges round 1 completed