Fixed merge conflict

diff --cc Game.py
index 57dbacc3898af042d4f93895e54b1b9d1862a868,3068fb4234180366173bb56cfc128522cf5753cf..11bcfc5dc5c5fbaf3fc5608300d8823445cb2c94
--- 1/Game.py
--- 2/Game.py
+++ b/Game.py
@@@ -72,18 -68,13 +72,21 @@@ class Game
          # self.pet.update(delta, self.player, self.camera_pos)
  
      def draw(self, surf):
- 
 +        screen.fill((0, 191, 255))
 +
 +        if(self.level == 1):
 +            self.Transition.draw(surf, self.player.position, [40, -250], 120, 625)
 +            self.dialogue.text = "enemy dialogue"
 +            self.dialogue.draw(surf, get_display_point(self.enemies[0].position)[0] + self.enemies[0].width/2, get_display_point(self.enemies[0].position)[1])
 +            self.dialogue.text = "player dialogue"
 +            self.dialogue.draw(surf, get_display_point(self.player.position)[0] + self.player.width/2, get_display_point(self.player.position)[1])
+         # screen.fill((0, 191, 255))
          # screen.fill((255,255,255))
-         # sky = pg.image.load("Assets/world/SKY.png")
-         # surf.blit(sky,(0,0))
+         sky = pg.image.load("Assets/world/SKY.png")
+         surf.blit(sky,(0,0))
+         self.Transition.draw(surf, self.player.position, [40, -250], 120, 625)
+ 
+ 
          self.world.draw(surf)
          for enemy in self.enemies:
              enemy.draw(surf)