diff --git a/package.json b/package.json
index 40c5cdd9bd1..dcdf20655e3 100644
--- a/package.json
+++ b/package.json
@@ -33,14 +33,17 @@
     "font-awesome": "^4.5.0",
     "i18n-js": "^3.2.1",
     "ics": "nwcell/ics.js#^0.2.0",
-    "ics.js": "nwcell/ics.js#^0.2.0",
     "image-sequencer": "^2.2.3",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "inline-markdown-editor": "^0.5.0",
 =======
     "inline-markdown-editor": "^0.3.4",
     "jLouvain": "upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7",
 >>>>>>> update
+=======
+    "inline-markdown-editor": "^0.5.0",
+>>>>>>> dependency update
     "jlouvain": "upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7",
     "jquery": "^3.0.0",
     "jquery-confirm": "^3.3.4",
@@ -68,4 +71,4 @@
   "engines": {
     "yarn": ">= 1.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 4b9e1ff80dc..6b0ababc231 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,6 +3,7 @@
 
 
 "@types/node@^8.0.7":
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "8.10.42"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.42.tgz#d3d8e738e13540a09b3f4a714dac1ffbf8939f7d"
@@ -12,6 +13,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.40.tgz#4314888d5cd537945d73e9ce165c04cc550144a4"
   integrity sha512-RRSjdwz63kS4u7edIwJUn8NqKLLQ6LyqF/X4+4jp38MBT3Vwetewi2N4dgJEshLbDwNgOJXNYoOwzVZUSSLhkQ==
 >>>>>>> yarn file
+=======
+  version "8.10.42"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.42.tgz#d3d8e738e13540a09b3f4a714dac1ffbf8939f7d"
+  integrity sha512-8LCqostMfYwQs9by1k21/P4KZp9uFQk3Q528y3qtPKQnCJmKz0Em3YzgeNjTNV1FVrG/7n/6j12d4UKg9zSgDw==
+>>>>>>> dependency update
 
 abab@^1.0.0:
   version "1.0.4"
@@ -79,6 +85,7 @@ acorn@^5.0.0:
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.4:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
@@ -98,6 +105,16 @@ ajv@^6.5.5:
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
   integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
 >>>>>>> yarn file
+=======
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
+ajv@^6.5.5:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+  integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
+>>>>>>> dependency update
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -1186,6 +1203,7 @@ es-to-primitive@^1.2.0:
     is-symbol "^1.0.2"
 
 es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "0.10.48"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
@@ -1195,6 +1213,11 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.47.tgz#d24232e1380daad5449a817be19bde9729024a11"
   integrity sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==
 >>>>>>> yarn file
+=======
+  version "0.10.48"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.48.tgz#9a0b31eeded39e64453bcedf6f9d50bbbfb43850"
+  integrity sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==
+>>>>>>> dependency update
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -2031,11 +2054,12 @@ iconv-lite@~0.2.11:
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
   integrity sha1-HOYKOleGSiktEyH/RgnKS7llrcg=
 
-ics.js@nwcell/ics.js#^0.2.0, ics@nwcell/ics.js#^0.2.0:
+ics@nwcell/ics.js#^0.2.0:
   version "0.1.3"
   resolved "https://codeload.github.com/nwcell/ics.js/tar.gz/4f2e67a79af161af74d986ecc47c3d166a074f11"
   dependencies:
     bower "~1.2.8"
+    file-saver "^1.3.3"
     grunt "~0.4.2"
     grunt-contrib-concat "~0.3.0"
     grunt-contrib-jshint "~0.7.2"
@@ -2236,10 +2260,6 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-jLouvain@upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7, jlouvain@upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7:
-  version "0.0.0"
-  resolved "https://codeload.github.com/upphiminn/jLouvain/tar.gz/3fb3aa189b8232756c4c3f3e97aaf376debf44a7"
-
 jade@0.26.3:
   version "0.26.3"
   resolved "https://registry.yarnpkg.com/jade/-/jade-0.26.3.tgz#8f10d7977d8d79f2f6ff862a81b0513ccb25686c"
@@ -2248,6 +2268,10 @@ jade@0.26.3:
     commander "0.6.1"
     mkdirp "0.3.0"
 
+jlouvain@upphiminn/jLouvain#3fb3aa189b8232756c4c3f3e97aaf376debf44a7:
+  version "0.0.0"
+  resolved "https://codeload.github.com/upphiminn/jLouvain/tar.gz/3fb3aa189b8232756c4c3f3e97aaf376debf44a7"
+
 jpeg-js@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.0.4.tgz#06aaf47efec7af0b1924a59cd695a6d2b5ed870e"
@@ -2296,6 +2320,7 @@ jquery@^2.1.0:
   integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
 
 js-yaml@^3.1.0:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "3.12.2"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
@@ -2305,6 +2330,11 @@ js-yaml@^3.1.0:
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.1.tgz#295c8632a18a23e054cf5c9d3cecafe678167600"
   integrity sha512-um46hB9wNOKlwkHgiuyEVAybXBjwFUV0Z/RaHJblRd9DXltue9FTYvzCr9ErQrK9Adz5MU4gHWVaNUfdmrC8qA==
 >>>>>>> yarn file
+=======
+  version "3.12.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
+  integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
+>>>>>>> dependency update
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -2986,11 +3016,15 @@ object-inspect@~1.4.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 object-keys@^1.0.12, object-keys@^1.0.6:
 =======
 object-keys@^1.0.6:
 >>>>>>> yarn file
+=======
+object-keys@^1.0.12, object-keys@^1.0.6:
+>>>>>>> dependency update
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
   integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
@@ -3715,16 +3749,22 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> dependency update
 static-eval@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"
   integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==
+<<<<<<< HEAD
 =======
 static-eval2@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/static-eval2/-/static-eval2-2.0.1.tgz#a241d9c3ad1d08ac8598ca28bc0ef408ec76e4a0"
   integrity sha512-WtlMWiobkeCU9tVELHp8+QjTNeAQAqS9/hBHjVKywELbtZqMh3nfSGP8BUVH81/F6rqFLBkjXDJX37t0ym+mqA==
 >>>>>>> yarn file
+=======
+>>>>>>> dependency update
   dependencies:
     escodegen "^1.8.1"
 
@@ -3753,6 +3793,7 @@ static-module@^1.0.0:
     through2 "~0.4.1"
 
 static-module@^3.0.0:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.2.tgz#4ecdef701260ec1798461022ad4637a7c2c930ef"
@@ -3762,6 +3803,11 @@ static-module@^3.0.0:
   resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.1.tgz#ae73764637cf2425f82e5393a062cde8aecd45aa"
   integrity sha512-NavJkJ9k2vJUl2Hwvm0veRJG5pSYiMtuTC9OsRFFsQcjkksJeBX1VZA5R0csqH2+jkW7qGEne1CvnzvXAvcBTA==
 >>>>>>> yarn file
+=======
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/static-module/-/static-module-3.0.2.tgz#4ecdef701260ec1798461022ad4637a7c2c930ef"
+  integrity sha512-W3aj4MvIMKDoZhVR7XhX7aSlJdw/nf1QAZyJzUUDVkjeBliXNoa0IUUUsAsXm/Wp7+LxDLeZ3idnAZEDg82m2Q==
+>>>>>>> dependency update
   dependencies:
     acorn-node "^1.3.0"
     concat-stream "~1.6.0"
@@ -3775,11 +3821,15 @@ static-module@^3.0.0:
     readable-stream "~2.3.3"
     scope-analyzer "^2.0.1"
     shallow-copy "~0.0.1"
+<<<<<<< HEAD
 <<<<<<< HEAD
     static-eval "^2.0.1"
 =======
     static-eval2 "^2.0.1"
 >>>>>>> yarn file
+=======
+    static-eval "^2.0.1"
+>>>>>>> dependency update
     through2 "~2.0.3"
 
 stealthy-require@^1.1.1:
@@ -4323,9 +4373,9 @@ wrappy@1:
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
 ws@^6.1.2:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.1.4.tgz#5b5c8800afab925e94ccb29d153c8d02c1776ef9"
-  integrity sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.0.tgz#13806d9913b2a5f3cbb9ba47b563c002cbc7c526"
+  integrity sha512-deZYUNlt2O4buFCa3t5bKLf8A7FPP/TVjwOeVNpw818Ma5nk4MLXls2eoEGS39o8119QIYxTrTDoPQ5B/gTD6w==
   dependencies:
     async-limiter "~1.0.0"