diff --git a/Assets/_Project/Definitions.meta b/Assets/_Project/Definitions.meta
index a2de22b..672694e 100644
--- a/Assets/_Project/Definitions.meta
+++ b/Assets/_Project/Definitions.meta
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 01de85ee5d8a2014594d9910b1a6ff55
-=======
 guid: cf294cbfb17f5a5d7846479a116fc7b3
->>>>>>> 31b0b5f (adding uncommited files (oops))
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}