wire database into the game
fix merge conflict