I"M SORRY I FUCKED IT UP I IDNDANDNUB MER

Assets/Menu Assets (REPLACE WITH OUR OWN LATER)/Font/SFCartoonistHand SDF.asset

@@ -1338,7 +1338,6 @@ MonoBehaviour:
     m_Y: 260
     m_Width: 31
     m_Height: 10
-<<<<<<< HEAD
   - m_X: 476
     m_Y: 82
     m_Width: 547
@@ -1351,17 +1350,10 @@ MonoBehaviour:
     m_Y: 79
     m_Width: 441
     m_Height: 944
-=======
-  - m_X: 104
-    m_Y: 303
-    m_Width: 29
-    m_Height: 720
->>>>>>> main
   - m_X: 1004
     m_Y: 0
     m_Width: 19
     m_Height: 1023
-<<<<<<< HEAD
   - m_X: 0
     m_Y: 382
     m_Width: 1023
@@ -1378,32 +1370,6 @@ MonoBehaviour:
     m_Y: 303
     m_Width: 2
     m_Height: 720
-=======
-  - m_X: 636
-    m_Y: 79
-    m_Width: 387
-    m_Height: 944
-  - m_X: 476
-    m_Y: 76
-    m_Width: 46
-    m_Height: 6
-  - m_X: 360
-    m_Y: 161
-    m_Width: 663
-    m_Height: 862
-  - m_X: 537
-    m_Y: 158
-    m_Width: 486
-    m_Height: 865
-  - m_X: 360
-    m_Y: 135
-    m_Width: 116
-    m_Height: 888
-  - m_X: 537
-    m_Y: 82
-    m_Width: 45
-    m_Height: 941
->>>>>>> main
   m_fontInfo:
     Name: 
     PointSize: 0

UserSettings/EditorUserSettings.asset

@@ -9,55 +9,10 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-2:
-<<<<<<< HEAD
-      value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
-=======
-      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
->>>>>>> main
-      flags: 0
-    RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
-      flags: 0
-    RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
-      flags: 0
-<<<<<<< HEAD
-    RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
-      flags: 0
-    RecentlyUsedScenePath-8:
       value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
       flags: 0
-    RecentlyUsedScenePath-9:
+    RecentlyUsedScenePath-2:
       value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
-=======
-    RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
->>>>>>> main
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650