diff --git "a/knowledge_graph.html" "b/knowledge_graph.html"
--- "a/knowledge_graph.html"
+++ "b/knowledge_graph.html"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
@@ -219,4 +220,227 @@
drawGraph();
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> b96b49ad31dd18a91ca19d59316e1b3ef2f531ff
\ No newline at end of file