Fix merge conflict in orm
Updated ORM with user_games and updated specs
fixed m conflict