diff --git a/rhizosphere.scd b/rhizosphere.scd
index 268b6fd..6d9ccbb 100644
--- a/rhizosphere.scd
+++ b/rhizosphere.scd
@@ -29,8 +29,15 @@ Server.default.waitForBoot {
 	});
 });
 
+<<<<<<< HEAD
 s.meter;
 s.plotTree;
+=======
+
+
+
+s.meter; s.plotTree;
+>>>>>>> 6aab46529682cae5a6bb3e59e378d8fcf94a3e50