fix all merge conflicts

unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this

Assets/Scripts/Games/Tram&Pauline/Pauline.cs

@@ -2,17 +2,20 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Pauline : MonoBehaviour
+namespace HeavenStudio.Games.Scripts_TramAndPauline
 {
-    // Start is called before the first frame update
-    void Start()
+    public class Pauline : MonoBehaviour
     {
-        
-    }
+        // Start is called before the first frame update
+        void Start()
+        {
 
-    // Update is called once per frame
-    void Update()
-    {
-        
+        }
+
+        // Update is called once per frame
+        void Update()
+        {
+
+        }
     }
-}
+}