Fixed Merge Conflict

diff --cc Function/Portal.py
index 8d94ebc00862fee9c6698f2301035d914b03459b,feb4a051339612be5b59f08b7be0208937c1642f..a35239d407813691fd667d8fa7e5c286b5a4e7f7
--- 1/Function/Portal.py
--- 2/Function/Portal.py
+++ b/Function/Portal.py
@@@ -31,11 -38,9 +38,11 @@@ class Transition
  
          coords[1] += self.portalYAnim
          a = (((offsetX-self.width/2) + coords[0], offsetY + coords[1]), (offsetX+coords[0], offsetY-self.height/2+coords[1]), (offsetX+self.width/2 + coords[0], offsetY+coords[1]), (offsetX + coords[0], offsetY+self.height/2 + coords[1]))
-         portal_rect = (a[0][0], a[1][1], a[2][0], a[3][1])
-         # print(portal_rect)
+         portal_rect = pg.Rect(a[0][0], a[1][1], a[2][0], a[3][1])
+         # print(a[0][0], a[1][1], a[2][0], a[3][1])
          # print(playerPos[0], playerPos[1])
 +
 +        print(portal_rect, coords, playerPos)
          
          if(a[0][0] < playerPos[0]+self.width/2 < a[2][0] and a[1][1] < playerPos[1] < a[3][1]):
              # self.buttonStage += 0.1