diff --git a/deathstar.json b/deathstar.json
index a99c962..82f2b52 100644
--- a/deathstar.json
+++ b/deathstar.json
@@ -3,6 +3,10 @@
   lifePoint: "50000",
   regenPerSec: "100",
   owner: "Empire",
+<<<<<<< HEAD
+  modified: Yes
+=======
   color: "Reddish"
   type: fire
+>>>>>>> d96fed415d8815578a4e6ae1653f9167381cf542
 }