resolved conflict

static/js/group1.json

@@ -21,6 +21,10 @@
       "name": "Karacaoğlan",
       "group": 1
     },
+    {
+      "name": "Aşık Mahzuni Şerif",
+      "group": 1
+    },
     {
       "name": "Aşık Veysel",
       "group": 1
@@ -63,6 +67,18 @@
     {
       "name": "Kaygusuz Abdal",
       "group": 1
+    },
+    {
+      "name": "Ahmed Yesevi",
+      "group": 2
+    },
+    {
+      "name": "Mevlana Celaleddin Rumi",
+      "group": 2
+    },
+    {
+      "name": "Hacı Bektaş-i Veli",
+      "group": 2
     }
   ],
   "links": [
@@ -77,14 +93,24 @@
       "value": 1
     },
     {
-      "source": 1,
+      "source": 2,
       "target": 11,
       "value": 1
     },
     {
-      "source": 2,
+      "source": 14,
       "target": 11,
       "value": 1
+    },
+    {
+      "source": 15,
+      "target": 17,
+      "value": 3
+    },
+    {
+      "source": 15,
+      "target": 16,
+      "value": 3
     }
   ]
 }