fix tags and merge conflicts

game/Assets/Scenes/Main.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427147, b: 0.56452364, a: 1}
+  m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427135, b: 0.5645232, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -832,6 +832,53 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1693210522
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -5.24
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 1.836
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: -7.12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4783610330497104, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+      propertyPath: m_RootOrder
+      value: 19
+      objectReference: {fileID: 0}
+    - target: {fileID: 114164362095571268, guid: c991ea08034a50545a37f2df5089cf02,
+        type: 2}
+      propertyPath: maxPower
+      value: 20
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: c991ea08034a50545a37f2df5089cf02, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &1812503719
 Prefab:
   m_ObjectHideFlags: 0

game/Assets/Scripts/Enemy/Enemy.cs

@@ -15,7 +15,6 @@ public class Enemy : MonoBehaviour
     private bool dead = false;
 
 
-
     void OnCollisionEnter(Collision collision)
     {
         if(!dead)

game/ProjectSettings/TagManager.asset

@@ -6,6 +6,7 @@ TagManager:
   tags:
   - Bullet
   - Station
+  - DayTimeManager
   layers:
   - Default
   - TransparentFX