merge conflict should be resolved now
back end half of ee_sessions working