diff --git a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta
index 12155b6..6d7ae4d 100644
--- a/MuseumGame/Assets/Sprites/Paint Projectile.png.meta	
+++ b/MuseumGame/Assets/Sprites/Paint Projectile.png.meta	
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< Updated upstream
 guid: 91aa6c120a1f8d64d942204b2b6a6952
+=======
+guid: 99b222e3befa2bc4397d9c88480e9be8
+>>>>>>> Stashed changes
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}