diff --git a/Assets/Resources/Prefabs/WorldObjects/World1.meta b/Assets/Resources/Prefabs/WorldObjects/World1.meta
index 9cb159e..fe6cde6 100644
--- a/Assets/Resources/Prefabs/WorldObjects/World1.meta
+++ b/Assets/Resources/Prefabs/WorldObjects/World1.meta
@@ -1,12 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Resources/Prefabs/Modulok/module3.prefab.meta
-guid: 9a7886f1d68cf4230b9a1182099be3d2
-PrefabImporter:
-========
 guid: 7fd43fea6e592be348af51e93185cf90
 folderAsset: yes
 DefaultImporter:
->>>>>>>> master:Assets/Resources/Prefabs/WorldObjects/World1.meta
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta b/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta
index e68b85a..60d66bf 100644
--- a/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta
+++ b/Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta
@@ -1,13 +1,11 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Resources/Models/Map objects/module3.mat.meta
-guid: a165a068343ef47108ec4332d0bdc767
-NativeFormatImporter:
+<<<<<<<< HEAD:Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta
+guid: 8500f6075c56d47809b2a1e2dfb10d39
 ========
 guid: 801674bb4f54353d3966591ac2876a92
-PrefabImporter:
 >>>>>>>> master:Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta
+PrefabImporter:
   externalObjects: {}
-  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta b/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta
index ff8a4ee..60d66bf 100644
--- a/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta
+++ b/Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Resources/Prefabs/WorldObjects/World1/haz2.prefab.meta
 guid: 8500f6075c56d47809b2a1e2dfb10d39
+========
+guid: 801674bb4f54353d3966591ac2876a92
+>>>>>>>> master:Assets/Resources/Prefabs/WorldObjects/World1/haz1.prefab.meta
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/README.md b/README.md
index 7c7a395..58e3b90 100644
--- a/README.md
+++ b/README.md
@@ -6,4 +6,5 @@ A cél egy endless runner játék elkészítése Unityben C# használatával.
 
 Backend repo link: https://github.com/bance23/zarobackend.git
 
+
 Frontend link: https://github.com/bance23/zarofrontend.git