Fixed the Merge

Fixed merge and added a light to the main game.