diff --git a/Src/Unity/Scripts/Assets/BITFramework.cs b/Src/Unity/Scripts/Assets/BITFramework.cs
index 7a1b2d0..0ffbe94 100644
--- a/Src/Unity/Scripts/Assets/BITFramework.cs
+++ b/Src/Unity/Scripts/Assets/BITFramework.cs
@@ -142,22 +142,11 @@ namespace BITKit
                     }
                 }
 #endif
-<<<<<<< Updated upstream
-                #if UNITY_5_3_OR_NEWER
-                if (IsEditorSimulateMode is false && isOffline)
-=======
+
                 if (isOffline&& IsEditorSimulateMode is false)
->>>>>>> Stashed changes
                 {
                     initParameters = new OfflinePlayModeParameters();
                 }
-                #else
-                    if (isOffline)
-                {
-                    initParameters = new OfflinePlayModeParameters();
-                }
-                #endif
-               
 
                 InitializationOperation initOperation = null;
                 try