diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000000..5592767af6
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+    "editor.tabSize": 2,
+    "editor.detectIndentation": false
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 49085ffd43..38ee9d94d2 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 
 
 Condenser is the react.js web interface to the world's first and best
+<<<<<<< HEAD
 blockchain-based social media platform, steemit.com.  It uses
 [STEEM](https://github.com/steemit/steem), a blockchain powered by DPoS Governance and ChainBase DB to store JSON-based content for a plethora of web
 applications.
@@ -13,13 +14,29 @@ applications.
   content storage mechanism in react.js
 * Reviewing the inner workings of the steemit.com social media platform
 * Assisting with software development for steemit.com
+=======
+blockchain-based social media platform, steem.town.  It uses
+[STEEM](https://github.com/SteemDevs/steem), a blockchain powered by DPoS Governance and ChainBase DB to store JSON-based content for a plethora of web
+applications.
+
+## Why would I want to use Condenser (steem.town front-end)?
+
+* Learning how to build blockchain-based web applications using STEEM as a
+  content storage mechanism in react.js
+* Reviewing the inner workings of the steem.town social media platform
+* Assisting with software development for steem.town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 ## Installation
 
 #### Docker
 
 We highly recommend using docker to run condenser in production. This is how we run the
+<<<<<<< HEAD
 live steemit.com site and it is the most supported (and fastest) method of
+=======
+live steem.town site and it is the most supported (and fastest) method of
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 both building and running condenser. We will always have the latest version
 of condenser (master branch) available on Docker Hub. Configuration settings
 can be set using environment variables (see configuration section below for
@@ -109,7 +126,11 @@ yarn run start
 It will take quite a bit longer to start in this mode (~60s) as it needs to
 build and start the webpack-dev-server.
 
+<<<<<<< HEAD
 By default you will be connected to steemit.com's public steem node at
+=======
+By default you will be connected to steem.town's public steem node at
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 `wss://steemd.steeemit.com`. This is actually on the real blockchain and
 you would use your regular account name and credentials to login - there is
 not an official separate testnet at this time. If you intend to run a
diff --git a/config/default.json b/config/default.json
index 6059d395af..cad20065a0 100644
--- a/config/default.json
+++ b/config/default.json
@@ -19,7 +19,11 @@
     "reportOnly": false,
     "setAllHeaders": true
   },
+<<<<<<< HEAD
   "img_proxy_prefix": "https://steemitdevimages.com/",
+=======
+  "img_proxy_prefix": "https://steemitimages.com/",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "ipfs_prefix": false,
   "mixpanel": false,
   "notify": {
@@ -33,7 +37,11 @@
   "server_session_secret": "exiKdyF+IwRIXJDmtGIl4vWUz4i3eVSISpfZoeYc0s4=",
   "session_cookie_key": "stm-dev",
   "session_key": "steemses",
+<<<<<<< HEAD
   "site_domain": "steemitdev.com",
+=======
+  "site_domain": "steem.town",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "upload_image": false,
   "steemd_connection_client": "https://api.steemit.com",
   "steemd_connection_server": "https://api.steemit.com",
@@ -43,7 +51,11 @@
   "conveyor_posting_wif": false,
   "conveyor_username": false,
   "special_posts_url": false,
+<<<<<<< HEAD
   "wallet_url": "https://wallet.steemitdev.com",
+=======
+  "wallet_url": "https://wallet.steem.town",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "gpt_banned_tags": ["nsfw", "tante"],
   "google_ad_enabled": null,
   "google_ad_test": null,
diff --git a/package.json b/package.json
index 5e8f11a1e1..2bc5c8a997 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "name": "steemit.com",
   "repository": {
     "type": "git",
@@ -6,6 +7,15 @@
   },
   "version": "1.0.0",
   "description": "steemit.com is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!",
+=======
+  "name": "steem.town",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/therealwolf42/condenser.git"
+  },
+  "version": "1.0.0",
+  "description": "steem.town is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   "main": "index.js",
   "scripts": {
     "build": "NODE_ENV=production webpack --config ./webpack/prod.config.js && rm -rf ./lib && babel src --out-dir lib -Dq",
@@ -86,7 +96,11 @@
     "mixpanel": "0.5.0",
     "net": "1.0.2",
     "node-cache": "^4.2.0",
+<<<<<<< HEAD
     "node-sass": "4.9.0",
+=======
+    "node-sass": "^4.13.1",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     "os": "0.1.1",
     "picturefill": "3.0.2",
     "qrious": "^4.0.2",
diff --git a/src/app/assets/icons/logo.svg b/src/app/assets/icons/logo.svg
index 646570d283..570adc19f3 100644
--- a/src/app/assets/icons/logo.svg
+++ b/src/app/assets/icons/logo.svg
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <svg class="logo-new logo-new--mobile" viewBox="0 0 38 38" version="1.1">
 <title>Steemit Logo</title>
     <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
@@ -5,4 +6,25 @@
             <path d="M32.7004951,11.3807248 C31.1310771,9.81140963 29.3043776,8.66313021 27.3619013,7.92312792 C28.4939405,4.59311764 32.5075339,3.38104493 32.5075339,3.38104493 C32.5075339,3.38104493 23.1424826,-1.48000457 12.7997611,0.459311764 C9.35218721,1.00793415 6.0461183,3.12587173 3.62767097,5.92001831 C-1.62087426,11.9803819 -0.926213868,21.1028239 5.18422484,26.3083572 C6.1233028,27.1121528 8.22014805,28.3625014 8.2587403,28.4262947 C6.8822836,31.9221676 2.48276772,32.8790671 2.48276772,32.8790671 C2.48276772,32.8790671 8.29733255,36.5152853 16.10583,37.4594261 C18.1769471,37.7145993 20.3767051,37.7783926 22.6536475,37.5359781 C26.2684544,37.2425289 29.8703972,35.3287299 32.6104465,32.6366526 C38.5407881,26.7931863 38.5922444,17.2752258 32.7004951,11.3807248 Z M30.0247661,30.3145765 C27.8121441,32.4835487 24.5060752,33.861484 21.9589871,34.0528639 C20.1580157,34.2314851 18.2284034,34.2570024 16.3759757,34.0273465 C13.6487905,33.6956214 11.680586,32.9428604 9.75097374,32.2156168 C10.7286439,31.271476 11.7063141,29.9700926 12.1051006,28.8473305 C12.3623823,28.1838802 12.3366541,27.4438779 12.0279162,26.7931863 C9.95679906,22.5317938 10.8572848,17.4283297 14.2662664,14.1110781 C16.73617,11.6996913 20.1322875,10.5641706 23.5798614,10.9852064 C26.1140854,11.2914142 28.416756,12.4014176 30.2177274,14.2003887 C34.5915151,18.5893678 34.4371461,26.014908 30.0247661,30.3145765 Z" class="icon-svg__shape"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
+=======
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 590.95 590.95" className="logo__icon" data-v-2349e389=""><path width="20px" height="20px" d="M295.47,0C132.29,0,0,132.29,0,295.47s132.29,295.47,295.47,295.47s295.47-132.29,295.47-295.47
+    S458.66,0,295.47,0z M221.64,397.6l-2.81,2.82c-5.78,5.81-11.97,11.32-18.4,16.39l-7.35,5.79c-0.49,0.39-1.08,0.59-1.67,0.59
+    c-0.5,0-1-0.14-1.45-0.42c-0.98-0.62-1.45-1.75-1.2-2.88l2.93-13.06c3.19-14.24,2.48-29.1-2.05-42.98l-1.57-4.82
+    c-1.82-5.58-3.95-11.14-6.33-16.52l-0.01-0.02l-34.16-80.51l-3.66-10.96c-1.13-3.39-1.9-6.91-2.3-10.45l-0.62-5.5
+    c-1.74-15.48,3.56-30.7,14.55-41.75l2.81-2.82c5.78-5.81,11.97-11.33,18.4-16.39l7.35-5.79c0.91-0.72,2.13-0.78,3.11-0.16
+    c0.98,0.62,1.45,1.75,1.2,2.88l-2.93,13.06c-3.19,14.24-2.49,29.1,2.05,42.98l1.57,4.82c1.82,5.58,3.95,11.14,6.33,16.52
+    l34.17,80.52l3.66,10.96c1.13,3.39,1.9,6.91,2.3,10.45l0.62,5.5C237.94,371.34,232.63,386.56,221.64,397.6z M336.99,424.02
+    l-3.6,3.62c-7.27,7.31-15.07,14.26-23.17,20.64l-9.61,7.57c-0.54,0.42-1.18,0.64-1.82,0.64c-0.54,0-1.09-0.15-1.58-0.46
+    c-1.07-0.67-1.59-1.91-1.31-3.15l3.79-16.91c4.03-17.99,3.14-36.77-2.59-54.29l-2-6.11c-2.31-7.06-4.99-14.08-7.99-20.86l-0.01-0.02
+    l-43.09-101.55l-4.61-13.81c-1.42-4.25-2.38-8.65-2.88-13.09l-0.79-7.02c-2.18-19.39,4.46-38.45,18.23-52.28l3.6-3.62
+    c7.28-7.31,15.07-14.26,23.17-20.64l9.6-7.57c0.99-0.78,2.33-0.86,3.4-0.18c1.07,0.67,1.59,1.91,1.31,3.15l-3.79,16.91
+    c-4.03,17.99-3.14,36.77,2.59,54.29l2,6.11c2.3,7.05,4.99,14.07,7.99,20.86l43.09,101.56l4.61,13.81c1.41,4.25,2.38,8.65,2.88,13.09
+    l0.79,7.02C357.39,391.13,350.75,410.19,336.99,424.02z M435.4,397.6l-2.81,2.82c-5.78,5.81-11.97,11.32-18.4,16.39l-7.35,5.79
+    c-0.49,0.39-1.08,0.59-1.67,0.59c-0.5,0-1-0.14-1.45-0.42c-0.98-0.62-1.45-1.75-1.2-2.88l2.93-13.06
+    c3.19-14.24,2.48-29.1-2.05-42.98l-1.57-4.82c-1.82-5.58-3.95-11.14-6.33-16.52l-0.01-0.02l-34.16-80.51l-3.66-10.96
+    c-1.13-3.39-1.9-6.91-2.3-10.45l-0.62-5.5c-1.74-15.48,3.56-30.7,14.55-41.75l2.81-2.82c5.78-5.81,11.97-11.33,18.4-16.39l7.35-5.79
+    c0.91-0.72,2.13-0.78,3.11-0.16c0.98,0.62,1.45,1.75,1.2,2.88l-2.93,13.06c-3.19,14.24-2.49,29.1,2.05,42.98l1.57,4.82
+    c1.82,5.58,3.95,11.14,6.33,16.52l34.17,80.52l3.66,10.96c1.13,3.39,1.9,6.91,2.3,10.45l0.62,5.5
+    C451.69,371.34,446.39,386.56,435.4,397.6z" class="st0" data-v-2349e389=""/></svg>
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
diff --git a/src/app/assets/icons/steem.svg b/src/app/assets/icons/steem.svg
index c76eb79572..ad37d526f2 100644
--- a/src/app/assets/icons/steem.svg
+++ b/src/app/assets/icons/steem.svg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<<<<<<< HEAD
 <svg width="30px" height="30px" viewBox="0 0 30 30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
     <title>steem</title>
@@ -13,4 +14,25 @@
             </g>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
+=======
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 590.95 590.95" className="logo__icon" data-v-2349e389=""><path width="20px" height="20px" d="M295.47,0C132.29,0,0,132.29,0,295.47s132.29,295.47,295.47,295.47s295.47-132.29,295.47-295.47
+    S458.66,0,295.47,0z M221.64,397.6l-2.81,2.82c-5.78,5.81-11.97,11.32-18.4,16.39l-7.35,5.79c-0.49,0.39-1.08,0.59-1.67,0.59
+    c-0.5,0-1-0.14-1.45-0.42c-0.98-0.62-1.45-1.75-1.2-2.88l2.93-13.06c3.19-14.24,2.48-29.1-2.05-42.98l-1.57-4.82
+    c-1.82-5.58-3.95-11.14-6.33-16.52l-0.01-0.02l-34.16-80.51l-3.66-10.96c-1.13-3.39-1.9-6.91-2.3-10.45l-0.62-5.5
+    c-1.74-15.48,3.56-30.7,14.55-41.75l2.81-2.82c5.78-5.81,11.97-11.33,18.4-16.39l7.35-5.79c0.91-0.72,2.13-0.78,3.11-0.16
+    c0.98,0.62,1.45,1.75,1.2,2.88l-2.93,13.06c-3.19,14.24-2.49,29.1,2.05,42.98l1.57,4.82c1.82,5.58,3.95,11.14,6.33,16.52
+    l34.17,80.52l3.66,10.96c1.13,3.39,1.9,6.91,2.3,10.45l0.62,5.5C237.94,371.34,232.63,386.56,221.64,397.6z M336.99,424.02
+    l-3.6,3.62c-7.27,7.31-15.07,14.26-23.17,20.64l-9.61,7.57c-0.54,0.42-1.18,0.64-1.82,0.64c-0.54,0-1.09-0.15-1.58-0.46
+    c-1.07-0.67-1.59-1.91-1.31-3.15l3.79-16.91c4.03-17.99,3.14-36.77-2.59-54.29l-2-6.11c-2.31-7.06-4.99-14.08-7.99-20.86l-0.01-0.02
+    l-43.09-101.55l-4.61-13.81c-1.42-4.25-2.38-8.65-2.88-13.09l-0.79-7.02c-2.18-19.39,4.46-38.45,18.23-52.28l3.6-3.62
+    c7.28-7.31,15.07-14.26,23.17-20.64l9.6-7.57c0.99-0.78,2.33-0.86,3.4-0.18c1.07,0.67,1.59,1.91,1.31,3.15l-3.79,16.91
+    c-4.03,17.99-3.14,36.77,2.59,54.29l2,6.11c2.3,7.05,4.99,14.07,7.99,20.86l43.09,101.56l4.61,13.81c1.41,4.25,2.38,8.65,2.88,13.09
+    l0.79,7.02C357.39,391.13,350.75,410.19,336.99,424.02z M435.4,397.6l-2.81,2.82c-5.78,5.81-11.97,11.32-18.4,16.39l-7.35,5.79
+    c-0.49,0.39-1.08,0.59-1.67,0.59c-0.5,0-1-0.14-1.45-0.42c-0.98-0.62-1.45-1.75-1.2-2.88l2.93-13.06
+    c3.19-14.24,2.48-29.1-2.05-42.98l-1.57-4.82c-1.82-5.58-3.95-11.14-6.33-16.52l-0.01-0.02l-34.16-80.51l-3.66-10.96
+    c-1.13-3.39-1.9-6.91-2.3-10.45l-0.62-5.5c-1.74-15.48,3.56-30.7,14.55-41.75l2.81-2.82c5.78-5.81,11.97-11.33,18.4-16.39l7.35-5.79
+    c0.91-0.72,2.13-0.78,3.11-0.16c0.98,0.62,1.45,1.75,1.2,2.88l-2.93,13.06c-3.19,14.24-2.49,29.1,2.05,42.98l1.57,4.82
+    c1.82,5.58,3.95,11.14,6.33,16.52l34.17,80.52l3.66,10.96c1.13,3.39,1.9,6.91,2.3,10.45l0.62,5.5
+    C451.69,371.34,446.39,386.56,435.4,397.6z" class="st0" data-v-2349e389=""/></svg>
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
diff --git a/src/app/assets/images/favicons/android-chrome-512x512.png b/src/app/assets/images/favicons/android-chrome-512x512.png
new file mode 100644
index 0000000000..e5b86a5d34
Binary files /dev/null and b/src/app/assets/images/favicons/android-chrome-512x512.png differ
diff --git a/src/app/assets/static/manifest.json b/src/app/assets/static/manifest.json
index e01009fda3..82c69db87a 100644
--- a/src/app/assets/static/manifest.json
+++ b/src/app/assets/static/manifest.json
@@ -1,6 +1,11 @@
 {
+<<<<<<< HEAD
     "name": "Steemit",
     "short_name": "Steemit",
+=======
+    "name": "SteemTown",
+    "short_name": "SteemTown",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     "theme_color": "#FFFFFF",
     "background_color": "#FFFFFF",
     "start_url": "/",
diff --git a/src/app/assets/static/search.html b/src/app/assets/static/search.html
index e9284507d1..a4f75e5e78 100644
--- a/src/app/assets/static/search.html
+++ b/src/app/assets/static/search.html
@@ -3,7 +3,11 @@
     <meta charSet="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/ico" href="/favicon.ico" />
+<<<<<<< HEAD
     <title>Search - steemit.com</title>
+=======
+    <title>Search - steem.town</title>
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/foundation/6.2.1/foundation-flex.css">
     <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet">
     <style>
diff --git a/src/app/assets/stylesheets/_variables.scss b/src/app/assets/stylesheets/_variables.scss
index c582eea029..34b954f93b 100755
--- a/src/app/assets/stylesheets/_variables.scss
+++ b/src/app/assets/stylesheets/_variables.scss
@@ -8,28 +8,53 @@ $color-blue-original-dark: #1A5099;
 $color-blue-original-light: #4BA2F2;
 $color-blue-black: #171F24;
 $color-blue-black-darkest: #11161A;
+<<<<<<< HEAD
 $color-blue-dark: #2C3A45;
 $color-teal: #06D6A9;
 $color-teal-light:#00FFC8;
 $color-teal-dark:#049173;
+=======
+$color-blue-dark: rgb(17, 23, 27);
+$color-teal: #03a2ff;
+$color-teal-light:#0ea7ff;
+$color-teal-dark:#0599ee;
+
+/*
+$color-teal: rgb(6, 89, 214);
+$color-teal-light:rgb(11, 98, 228);
+$color-teal-dark:rgb(5, 83, 201);
+*/
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 $color-yellow: #fce76c;
 $color-orange: #F76900;
 $color-transparent: transparent;
 
 $color-background-almost-white:#fefefe;
+<<<<<<< HEAD
 $color-background-off-white: #f4f4f4;
 $color-background-off-white-light: #fafafa;
 $color-background-dark: #1C252B;
 $color-background-less-dark: #283336;
 $color-background-super-dark: #10151b;
+=======
+$color-background-off-white: #f1f5fa;
+$color-background-off-white-light: #fafafa;
+$color-background-dark: #252b36;
+$color-background-less-dark: #2d323b;
+$color-background-super-dark: rgb(18, 25, 32);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 $color-text-dark: #333;
 $color-text-white: #fcfcfc;
 $color-text-blue: #004EFF;
 $color-text-gray: #788187;
 $color-text-gray-light: #A6B2BA;
+<<<<<<< HEAD
 $color-text-teal: #1FBF8F;
+=======
+$color-text-teal: $color-teal;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 $color-text-red: $color-red;
 
 $color-border-light: #eee;
diff --git a/src/app/assets/stylesheets/app.scss b/src/app/assets/stylesheets/app.scss
index 4a30f6d53d..4a9ecf1a96 100644
--- a/src/app/assets/stylesheets/app.scss
+++ b/src/app/assets/stylesheets/app.scss
@@ -19,6 +19,13 @@
 @import "./markdown";
 @import "src/app/components/all";
 
+<<<<<<< HEAD
+=======
+[type='text'], [type='password'], [type='date'], [type='datetime'], [type='datetime-local'], [type='month'], [type='week'], [type='email'], [type='number'], [type='search'], [type='tel'], [type='time'], [type='url'], [type='color'], textarea {
+  box-shadow: none;
+}
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 /* Small only */
 @media screen and (max-width: 39.9375em) {
   body {
diff --git a/src/app/client_config.js b/src/app/client_config.js
index 52c0f761de..57042950ae 100644
--- a/src/app/client_config.js
+++ b/src/app/client_config.js
@@ -1,4 +1,5 @@
 // sometimes it's impossible to use html tags to style coin name, hence usage of _UPPERCASE modifier
+<<<<<<< HEAD
 export const APP_NAME = 'Steemit';
 // sometimes APP_NAME is written in non-latin characters, but they are needed for technical purposes
 // ie. "Голос" > "Golos"
@@ -9,6 +10,18 @@ export const APP_ICON = 'steem';
 // vars. client should read $STM_Config, server should read config package.
 export const APP_URL = 'https://steemit.com';
 export const APP_DOMAIN = 'steemit.com';
+=======
+export const APP_NAME = 'SteemTown';
+// sometimes APP_NAME is written in non-latin characters, but they are needed for technical purposes
+// ie. "Голос" > "Golos"
+export const APP_NAME_LATIN = 'SteemTown';
+export const APP_NAME_UPPERCASE = 'STEEMTOWN';
+export const APP_ICON = 'steem';
+// FIXME figure out best way to do this on both client and server from env
+// vars. client should read $STM_Config, server should read config package.
+export const APP_URL = 'https://steem.town';
+export const APP_DOMAIN = 'steem.town';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 export const LIQUID_TOKEN = 'Steem';
 // sometimes it's impossible to use html tags to style coin name, hence usage of _UPPERCASE modifier
 export const LIQUID_TOKEN_UPPERCASE = 'STEEM';
@@ -19,7 +32,11 @@ export const DEBT_TOKEN = 'STEEM DOLLAR';
 export const DEBT_TOKENS = 'STEEM DOLLARS';
 export const CURRENCY_SIGN = '$';
 export const WIKI_URL = ''; // https://wiki.golos.io/
+<<<<<<< HEAD
 export const LANDING_PAGE_URL = 'https://steem.io/';
+=======
+export const LANDING_PAGE_URL = 'https://steemapps.com/';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 export const TERMS_OF_SERVICE_URL = 'https://' + APP_DOMAIN + '/tos.html';
 export const PRIVACY_POLICY_URL = 'https://' + APP_DOMAIN + '/privacy.html';
 export const WHITEPAPER_URL = 'https://steem.io/SteemWhitePaper.pdf';
@@ -36,13 +53,21 @@ export const DEFAULT_CURRENCY = 'USD';
 export const ALLOWED_CURRENCIES = ['USD'];
 
 // meta info
+<<<<<<< HEAD
 export const TWITTER_HANDLE = '@steemit';
+=======
+export const TWITTER_HANDLE = '@steemtown';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 export const SHARE_IMAGE =
     'https://' + APP_DOMAIN + '/images/steemit-share.png';
 export const TWITTER_SHARE_IMAGE =
     'https://' + APP_DOMAIN + '/images/steemit-twshare.png';
 export const SITE_DESCRIPTION =
+<<<<<<< HEAD
     'Steemit is a social media platform where everyone gets paid for ' +
+=======
+    'SteemTown is a social media platform where everyone gets paid for ' +
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     'creating and curating content. It leverages a robust digital points system, called Steem, that ' +
     'supports real value for digital rewards through market price discovery and liquidity';
 
diff --git a/src/app/components/App.jsx b/src/app/components/App.jsx
index 542b337418..1b4b8c8d94 100644
--- a/src/app/components/App.jsx
+++ b/src/app/components/App.jsx
@@ -109,6 +109,7 @@ class App extends React.Component {
                     </div>
                 </div>
             );
+<<<<<<< HEAD
         } else if (false && ip && this.state.showCallout) {
             callout = (
                 <div className="App__announcement row">
@@ -137,6 +138,8 @@ class App extends React.Component {
                     </div>
                 </div>
             );
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         }
         if ($STM_Config.read_only_mode && this.state.showCallout) {
             callout = (
diff --git a/src/app/components/App.scss b/src/app/components/App.scss
index 018dbf3288..1420334b15 100644
--- a/src/app/components/App.scss
+++ b/src/app/components/App.scss
@@ -58,7 +58,11 @@
   background-color: $color-blue-black;
   color: $color-white;
   position: relative;
+<<<<<<< HEAD
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05);
+=======
+  // box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.05);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
   h2 {
     font-weight: bold;
diff --git a/src/app/components/cards/PostSummary.scss b/src/app/components/cards/PostSummary.scss
index 6ca937c9b8..4a57b2792b 100644
--- a/src/app/components/cards/PostSummary.scss
+++ b/src/app/components/cards/PostSummary.scss
@@ -23,7 +23,11 @@ ul.PostsList__summaries > li {
   &:hover {
     @include MQ(L) {
       @include themify($themes) {
+<<<<<<< HEAD
         box-shadow: 2px 2px 3px 0 themed('contentBorderAccent');
+=======
+        // box-shadow: 2px 2px 3px 0 themed('contentBorderAccent');
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
       }
     }
   }
diff --git a/src/app/components/elements/Announcement.jsx b/src/app/components/elements/Announcement.jsx
index 14674ab2b2..e3be2f7a61 100644
--- a/src/app/components/elements/Announcement.jsx
+++ b/src/app/components/elements/Announcement.jsx
@@ -4,8 +4,18 @@ import React from 'react';
 export const Announcement = ({ onClose }) => (
     <div className="annoucement-banner">
         <p className="announcement-banner__text">
+<<<<<<< HEAD
             Communities are live!{' '}
             <a className="announcement-banner__link" href="https://steemit.com/steemit/@steemitblog/communities-have-arrived">Read more</a>.
+=======
+            Steem Town is live!{' '}
+            <a
+                className="announcement-banner__link"
+                href="https://steem.town/steemtown/@therealwolf/steemtown"
+            >
+                Read more
+            </a>.
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         </p>
         <button className="close-button" type="button" onClick={onClose}>
             &times;
diff --git a/src/app/components/elements/ElasticSearchInput/styles.scss b/src/app/components/elements/ElasticSearchInput/styles.scss
index 071ad10eff..f53b53d11a 100644
--- a/src/app/components/elements/ElasticSearchInput/styles.scss
+++ b/src/app/components/elements/ElasticSearchInput/styles.scss
@@ -21,16 +21,25 @@ form.search-input {
         transition: all 0.3s ease-in-out;
         font-size: 16px;
         background: transparent;
+<<<<<<< HEAD
         box-shadow: none;
+=======
+        box-shadow: none !important;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         width: 42px;
         height: 42px;
         color: transparent;
         cursor: pointer;
         transition: all 0.3s ease-in-out;
         font-family: $font-primary;
+<<<<<<< HEAD
         @include themify($themes) {
             border: 1px solid rgba(202, 202, 202, 0.6);
         }
+=======
+        border: 1px solid rgba(173, 173, 173, 0.6);
+        
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         &::placeholder {
             color: transparent
         }
@@ -44,7 +53,11 @@ form.search-input {
                 border: themed('moduleBackgroundColor');
             }
             border-color: $color-teal;
+<<<<<<< HEAD
             box-shadow: 0 0 5px rgba(109,207,246,.5);
+=======
+            // box-shadow: 0 0 5px rgba(109,207,246,.5);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             width: 180px;
             padding-left: 2.5rem;
             @include themify($themes) {
diff --git a/src/app/components/elements/PdfDownload.jsx b/src/app/components/elements/PdfDownload.jsx
index 3243c57035..95e87f47d9 100644
--- a/src/app/components/elements/PdfDownload.jsx
+++ b/src/app/components/elements/PdfDownload.jsx
@@ -219,7 +219,11 @@ export default class PdfDownload extends Component {
             ctx,
             'Generated at ' +
                 new Date().toISOString().replace(/\.\d{3}/, '') +
+<<<<<<< HEAD
                 ' by steemit.com',
+=======
+                ' by steem.town',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             {
                 scale,
                 x: margin,
@@ -327,7 +331,11 @@ export default class PdfDownload extends Component {
 
         offset += this.renderText(
             ctx,
+<<<<<<< HEAD
             'Used to log in to apps such as Steemit.com and perform social ' +
+=======
+            'Used to log in to apps such as steem.town and perform social ' +
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 'actions such as posting, commenting, and voting.',
             {
                 scale,
@@ -519,7 +527,11 @@ export default class PdfDownload extends Component {
             'This key is used to reset all your other keys. It is ' +
                 'recommended to keep it offline at all times. If your ' +
                 'account is compromised, use this key to recover it ' +
+<<<<<<< HEAD
                 'within 30 days at https://steemitwallet.com.',
+=======
+                'within 30 days at https://wallet.steem.town',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             {
                 scale,
                 x: margin + qrSize + 0.1,
diff --git a/src/app/components/elements/ReplyEditor.jsx b/src/app/components/elements/ReplyEditor.jsx
index 6ec9514fc4..3998095b36 100644
--- a/src/app/components/elements/ReplyEditor.jsx
+++ b/src/app/components/elements/ReplyEditor.jsx
@@ -1160,7 +1160,11 @@ export default formId =>
                     meta.links = rtags.links; // TODO: remove? save first?
                 else delete meta.links;
 
+<<<<<<< HEAD
                 meta.app = 'steemit/0.2';
+=======
+                meta.app = 'steemtown/0.1';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 if (isStory) {
                     meta.format = isHtml ? 'html' : 'markdown';
                 }
diff --git a/src/app/components/elements/SearchInput/styles.scss b/src/app/components/elements/SearchInput/styles.scss
index 54851bf18b..5b4fc33fbd 100644
--- a/src/app/components/elements/SearchInput/styles.scss
+++ b/src/app/components/elements/SearchInput/styles.scss
@@ -25,9 +25,14 @@ form.search-input {
         color: transparent;
         cursor: pointer;
         font-family: $font-primary;
+<<<<<<< HEAD
         @include themify($themes) {
             border: 1px solid rgba(202, 202, 202, 0.6);
         }
+=======
+        border: 1px solid rgba(202, 202, 202, 0.6);
+        
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         &::placeholder {
             color: transparent
         }
@@ -40,7 +45,11 @@ form.search-input {
                 border: themed('moduleBackgroundColor');
             }
             border-color: $color-teal;
+<<<<<<< HEAD
             box-shadow: 0 0 5px rgba(109,207,246,.5);
+=======
+            // box-shadow: 0 0 5px rgba(109,207,246,.5);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             padding-left: 2.5rem;
             @include themify($themes) {
                 color: themed('textColorPrimary');
@@ -50,7 +59,11 @@ form.search-input {
             &::placeholder {
                 color: $color-blue-dark;
                 @include themify($themes) {
+<<<<<<< HEAD
                     color: themed('textColorSecondary');
+=======
+                    // color: themed('textColorSecondary');
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 }
             }
         }
@@ -78,7 +91,11 @@ form.search-input--expanded {
 
     &:hover {
         svg.search-input__icon {
+<<<<<<< HEAD
             stroke: $color-white;
+=======
+            // stroke: $color-white;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         }
     }
 
@@ -93,6 +110,7 @@ form.search-input--expanded {
         color: transparent;
         font-family: $font-primary;
         width: 100%;
+<<<<<<< HEAD
         border-color: $color-teal;
         box-shadow: 0 0 5px rgba(109,207,246,.5);
         padding-left: 2.5rem;
@@ -103,12 +121,27 @@ form.search-input--expanded {
         @include themify($themes) {
             border: themed('moduleBackgroundColor');
         }
+=======
+        
+        border-color: $color-teal;
+        // box-shadow: 0 0 5px rgba(109,207,246,.5);
+        padding-left: 2.5rem;
+        cursor: auto;
+        border: 1px solid rgba(202, 202, 202, 0.6);
+        
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         @include themify($themes) {
             color: themed('textColorPrimary');
         }
         &:hover {
+<<<<<<< HEAD
             background-color: $color-teal;
             color: $color-white;
+=======
+            // background-color: $color-teal;
+            // color: $color-white;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         }
         &::placeholder {
             @include themify($themes) {
@@ -116,7 +149,11 @@ form.search-input--expanded {
             }
         }
         &:hover::placeholder {
+<<<<<<< HEAD
             color: $color-text-white;
+=======
+            // color: $color-text-white;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         }
     }
 
diff --git a/src/app/components/elements/SidebarNewUsers.jsx b/src/app/components/elements/SidebarNewUsers.jsx
index 028349843b..00f4f59bd8 100644
--- a/src/app/components/elements/SidebarNewUsers.jsx
+++ b/src/app/components/elements/SidebarNewUsers.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import tt from 'counterpart';
+<<<<<<< HEAD
 import { SIGNUP_URL } from 'shared/constants';
 
 const SidebarNewUsers = () => (
@@ -40,3 +41,84 @@ const SidebarNewUsers = () => (
 );
 
 export default SidebarNewUsers;
+=======
+import { connect } from 'react-redux';
+import { SIGNUP_URL } from 'shared/constants';
+import Icon from 'app/components/elements/Icon';
+import { Link } from 'react-router';
+
+const SidebarNewUsers = ({ walletUrl }) => {
+    const makeLink = (i, ix, arr) => {
+        // A link is internal if it begins with a slash
+        const isExternal = !i.link.match(/^\//) || i.isExternal;
+        const cn = ix === arr.length - 1 ? 'last' : null;
+        if (isExternal) {
+            return (
+                <li key={ix} className={cn}>
+                    <a href={i.link} target="_blank" rel="noopener noreferrer">
+                        {i.label}&nbsp;<Icon name="extlink" />
+                    </a>
+                </li>
+            );
+        }
+        if (i.onClick) {
+            return (
+                <li key={ix} className={cn}>
+                    <a onClick={i.onClick}>{i.label}</a>
+                </li>
+            );
+        }
+        return (
+            <li key={ix} className={cn}>
+                <Link to={i.link}>{i.label}</Link>
+            </li>
+        );
+    };
+
+    const links = [
+        {
+            label: tt('navigation.what_is_steem'),
+            link: 'https://steemonboarding.com',
+        },
+        {
+            label: tt('navigation.app_center'),
+            link: 'https://steemapps.com/',
+        },
+        {
+            label: tt('navigation.blockexplorer'),
+            link: 'https://steemd.com/',
+        },
+        {
+            label: tt('navigation.steem_engine'),
+            link: 'https://steemengine.com/',
+        },
+        {
+            label: tt('navigation.vote_for_witnesses'),
+            link: `${walletUrl}/~witnesses`,
+        },
+        {
+            label: tt('navigation.steem_proposals'),
+            link: `${walletUrl}/proposals`,
+        },
+    ];
+
+    return (
+        <div className="c-sidebar__module">
+            <div className="c-sidebar__header">
+                <h3 className="c-sidebar__h3">More Steem</h3>
+            </div>
+            <div className="c-sidebar__content">
+                <ul className="c-sidebar__list">{links.map(makeLink)}</ul>
+            </div>
+        </div>
+    );
+};
+
+export default connect((state, ownProps) => {
+    const walletUrl = state.app.get('walletUrl');
+    return {
+        walletUrl,
+        ...ownProps,
+    };
+})(SidebarNewUsers);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
diff --git a/src/app/components/elements/SlateEditor.jsx b/src/app/components/elements/SlateEditor.jsx
index 0102f53364..a801eb6518 100644
--- a/src/app/components/elements/SlateEditor.jsx
+++ b/src/app/components/elements/SlateEditor.jsx
@@ -197,7 +197,11 @@ export default class SlateEditor extends React.Component {
         } else if (state.isExpanded) {
             const href = window.prompt(
                 'Enter the URL of the link:',
+<<<<<<< HEAD
                 'http://steemit.com'
+=======
+                'http://steem.town'
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             );
             if (href) {
                 state = state
diff --git a/src/app/components/elements/SteemLogo/index.jsx b/src/app/components/elements/SteemLogo/index.jsx
index 5496379ac7..b11b2d271e 100644
--- a/src/app/components/elements/SteemLogo/index.jsx
+++ b/src/app/components/elements/SteemLogo/index.jsx
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 
 const SteemLogo = () => {
     return (
+<<<<<<< HEAD
         <span className="logo">
             <svg width="150" height="40" viewBox="0 0 150 40" version="1.1">
                 <title>Home</title>
@@ -18,6 +19,44 @@ const SteemLogo = () => {
                 </g>
             </svg>
         </span>
+=======
+        <div className="logo">
+            <svg
+                xmlns="http://www.w3.org/2000/svg"
+                viewBox="0 0 590.95 590.95"
+                className="logo__icon"
+                data-v-2349e389=""
+            >
+                <path
+                    width="20px"
+                    height="20px"
+                    d="M295.47,0C132.29,0,0,132.29,0,295.47s132.29,295.47,295.47,295.47s295.47-132.29,295.47-295.47
+    S458.66,0,295.47,0z M221.64,397.6l-2.81,2.82c-5.78,5.81-11.97,11.32-18.4,16.39l-7.35,5.79c-0.49,0.39-1.08,0.59-1.67,0.59
+    c-0.5,0-1-0.14-1.45-0.42c-0.98-0.62-1.45-1.75-1.2-2.88l2.93-13.06c3.19-14.24,2.48-29.1-2.05-42.98l-1.57-4.82
+    c-1.82-5.58-3.95-11.14-6.33-16.52l-0.01-0.02l-34.16-80.51l-3.66-10.96c-1.13-3.39-1.9-6.91-2.3-10.45l-0.62-5.5
+    c-1.74-15.48,3.56-30.7,14.55-41.75l2.81-2.82c5.78-5.81,11.97-11.33,18.4-16.39l7.35-5.79c0.91-0.72,2.13-0.78,3.11-0.16
+    c0.98,0.62,1.45,1.75,1.2,2.88l-2.93,13.06c-3.19,14.24-2.49,29.1,2.05,42.98l1.57,4.82c1.82,5.58,3.95,11.14,6.33,16.52
+    l34.17,80.52l3.66,10.96c1.13,3.39,1.9,6.91,2.3,10.45l0.62,5.5C237.94,371.34,232.63,386.56,221.64,397.6z M336.99,424.02
+    l-3.6,3.62c-7.27,7.31-15.07,14.26-23.17,20.64l-9.61,7.57c-0.54,0.42-1.18,0.64-1.82,0.64c-0.54,0-1.09-0.15-1.58-0.46
+    c-1.07-0.67-1.59-1.91-1.31-3.15l3.79-16.91c4.03-17.99,3.14-36.77-2.59-54.29l-2-6.11c-2.31-7.06-4.99-14.08-7.99-20.86l-0.01-0.02
+    l-43.09-101.55l-4.61-13.81c-1.42-4.25-2.38-8.65-2.88-13.09l-0.79-7.02c-2.18-19.39,4.46-38.45,18.23-52.28l3.6-3.62
+    c7.28-7.31,15.07-14.26,23.17-20.64l9.6-7.57c0.99-0.78,2.33-0.86,3.4-0.18c1.07,0.67,1.59,1.91,1.31,3.15l-3.79,16.91
+    c-4.03,17.99-3.14,36.77,2.59,54.29l2,6.11c2.3,7.05,4.99,14.07,7.99,20.86l43.09,101.56l4.61,13.81c1.41,4.25,2.38,8.65,2.88,13.09
+    l0.79,7.02C357.39,391.13,350.75,410.19,336.99,424.02z M435.4,397.6l-2.81,2.82c-5.78,5.81-11.97,11.32-18.4,16.39l-7.35,5.79
+    c-0.49,0.39-1.08,0.59-1.67,0.59c-0.5,0-1-0.14-1.45-0.42c-0.98-0.62-1.45-1.75-1.2-2.88l2.93-13.06
+    c3.19-14.24,2.48-29.1-2.05-42.98l-1.57-4.82c-1.82-5.58-3.95-11.14-6.33-16.52l-0.01-0.02l-34.16-80.51l-3.66-10.96
+    c-1.13-3.39-1.9-6.91-2.3-10.45l-0.62-5.5c-1.74-15.48,3.56-30.7,14.55-41.75l2.81-2.82c5.78-5.81,11.97-11.33,18.4-16.39l7.35-5.79
+    c0.91-0.72,2.13-0.78,3.11-0.16c0.98,0.62,1.45,1.75,1.2,2.88l-2.93,13.06c-3.19,14.24-2.49,29.1,2.05,42.98l1.57,4.82
+    c1.82,5.58,3.95,11.14,6.33,16.52l34.17,80.52l3.66,10.96c1.13,3.39,1.9,6.91,2.3,10.45l0.62,5.5
+    C451.69,371.34,446.39,386.56,435.4,397.6z"
+                    class="st0"
+                    data-v-2349e389=""
+                />
+            </svg>
+            <span className="logo__text">Steem</span>
+            <span className="logo__textSmall"> Town</span>
+        </div>
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     );
 };
 
diff --git a/src/app/components/elements/SteemLogo/styles.scss b/src/app/components/elements/SteemLogo/styles.scss
index 9cfc9fa4a1..373c5b44a6 100644
--- a/src/app/components/elements/SteemLogo/styles.scss
+++ b/src/app/components/elements/SteemLogo/styles.scss
@@ -1,5 +1,30 @@
 .logo {
+<<<<<<< HEAD
     cursor: pointer;
+=======
+  display:flex;
+  align-items:center;
+  justify-content: center;
+    cursor: pointer;
+    &__icon {
+      height:25px;
+      width: 25px;
+      margin-right:8px;
+      fill: $color-teal;
+    }
+
+    &__text {
+      font-size:1.8rem;
+      font-weight:700;
+    }
+
+    &__textSmall {
+      font-size: 1.8rem;
+      font-weight:300;
+    }
+
+    
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     transition: all 0.3s ease-in-out;
     .logo__steemit{
         fill: $color-teal;
@@ -16,3 +41,19 @@
         }
     }
 }
+<<<<<<< HEAD
+=======
+
+.theme-dark {
+  .logo {
+    &__icon {
+      fill: white;
+    }
+
+    &__text,
+    &__textSmall {
+      color: white;
+    }
+  }
+}
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
diff --git a/src/app/components/modules/Header/index.jsx b/src/app/components/modules/Header/index.jsx
index 091908eec5..82a0258486 100644
--- a/src/app/components/modules/Header/index.jsx
+++ b/src/app/components/modules/Header/index.jsx
@@ -163,7 +163,11 @@ class Header extends React.Component {
                         [topic, 'title'],
                         '#' + topic
                     );
+<<<<<<< HEAD
                     if (name == '#my') name = 'My Communities';
+=======
+                    if (name == '#my') name = 'Communities Feed';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                     page_title = `${name} / ${page_title}`;
                 } else {
                     page_title += ' posts';
@@ -345,6 +349,18 @@ class Header extends React.Component {
                             </div>
 
                             <div className="small-6 medium-8 large-7 columns Header__buttons">
+<<<<<<< HEAD
+=======
+                                {/*CUSTOM SEARCH*/}
+                                <span className="Header__search--desktop">
+                                    <ElasticSearchInput redirect />
+                                </span>
+                                <span className="Header__search">
+                                    <a href="/search">
+                                        <IconButton icon="magnifyingGlass" />
+                                    </a>
+                                </span>
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                                 {/*NOT LOGGED IN SIGN IN AND SIGN UP LINKS*/}
                                 {!loggedIn && (
                                     <span className="Header__user-signup show-for-medium">
@@ -364,6 +380,7 @@ class Header extends React.Component {
                                     </span>
                                 )}
 
+<<<<<<< HEAD
                                 {/*CUSTOM SEARCH*/}
                                 <span className="Header__search--desktop">
                                     <ElasticSearchInput redirect />
@@ -376,6 +393,10 @@ class Header extends React.Component {
 
                                 {/*SUBMIT STORY*/}
                                 {submit_story}
+=======
+                                {/*SUBMIT STORY*/}
+                                {loggedIn && submit_story}
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                                 {/*USER AVATAR */}
                                 {loggedIn && (
                                     <DropdownMenu
diff --git a/src/app/components/modules/Header/styles.scss b/src/app/components/modules/Header/styles.scss
index 62710dc460..c831f8bbff 100644
--- a/src/app/components/modules/Header/styles.scss
+++ b/src/app/components/modules/Header/styles.scss
@@ -4,7 +4,11 @@
   left: 0;
   width: 100%;
   z-index: 100;
+<<<<<<< HEAD
   box-shadow: 0 2px 4px 0 rgba(0,0,0,0.05);
+=======
+  // box-shadow: 0 2px 4px 0 rgba(0,0,0,0.05);
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   @include themify($themes) {
     background-color: themed('navBackgroundColor');
     border-bottom: themed('border');
@@ -25,7 +29,11 @@
 
 .Header__logotype {
   transition: 0.2s all ease-in-out;
+<<<<<<< HEAD
   height: 37px;
+=======
+  height: 46px;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   display: flex;
   align-items: baseline;
   .icon-svg {
@@ -47,6 +55,10 @@
 }
 
 .Header__search {
+<<<<<<< HEAD
+=======
+  
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     @include MQ(L) {
         display: none;
     }
@@ -55,6 +67,10 @@
         @include MQ(L) {
             display: block;
         }
+<<<<<<< HEAD
+=======
+        margin-right: 15px;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     }
 }
 
diff --git a/src/app/components/modules/SidePanel/index.jsx b/src/app/components/modules/SidePanel/index.jsx
index facb55d4b8..05d6787db0 100644
--- a/src/app/components/modules/SidePanel/index.jsx
+++ b/src/app/components/modules/SidePanel/index.jsx
@@ -54,6 +54,7 @@ const SidePanel = ({
 
     const sidePanelLinks = {
         internal: [
+<<<<<<< HEAD
             {
                 label: tt('navigation.welcome'),
                 link: `/welcome`,
@@ -62,6 +63,8 @@ const SidePanel = ({
                 label: tt('navigation.faq'),
                 link: `/faq.html`,
             },
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             /*
             {
                 label: tt('navigation.explore'),
@@ -77,6 +80,7 @@ const SidePanel = ({
 
         wallet: [
             {
+<<<<<<< HEAD
                 label: tt('navigation.stolen_account_recovery'),
                 link: `${walletUrl}/recover_account_step_1`,
             },
@@ -85,6 +89,8 @@ const SidePanel = ({
                 link: `${walletUrl}/change_password`,
             },
             {
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 label: tt('navigation.vote_for_witnesses'),
                 link: `${walletUrl}/~witnesses`,
             },
@@ -92,6 +98,17 @@ const SidePanel = ({
                 label: tt('navigation.steem_proposals'),
                 link: `${walletUrl}/proposals`,
             },
+<<<<<<< HEAD
+=======
+            {
+                label: tt('navigation.stolen_account_recovery'),
+                link: `${walletUrl}/recover_account_step_1`,
+            },
+            {
+                label: tt('navigation.change_account_password'),
+                link: `${walletUrl}/change_password`,
+            },
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
 
         external: [
@@ -101,6 +118,7 @@ const SidePanel = ({
                 link: 'https://steem.chat/home',
             },
             */
+<<<<<<< HEAD
             {
                 label: tt('navigation.advertise'),
                 link: 'https://selfserve.steemit.com',
@@ -119,6 +137,28 @@ const SidePanel = ({
                 label: tt('navigation.business_center'),
                 link: 'https://steemeconomy.com/',
             },*/
+=======
+            /* {
+                label: tt('navigation.advertise'),
+                link: 'https://selfserve.steemit.com',
+            }, */
+            {
+                label: tt('navigation.what_is_steem'),
+                link: 'https://steemonboarding.com',
+            },
+            {
+                label: tt('navigation.app_center'),
+                link: 'https://steemapps.com/',
+            },
+            {
+                label: tt('navigation.blockexplorer'),
+                link: 'https://steemd.com/',
+            },
+            {
+                label: tt('navigation.steem_engine'),
+                link: 'https://steemengine.com/',
+            },
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
 
         organizational: [
@@ -140,7 +180,11 @@ const SidePanel = ({
             },
         ],
 
+<<<<<<< HEAD
         legal: [
+=======
+        /* legal: [
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             {
                 label: tt('navigation.privacy_policy'),
                 link: '/privacy.html',
@@ -149,7 +193,11 @@ const SidePanel = ({
                 label: tt('navigation.terms_of_service'),
                 link: '/tos.html',
             },
+<<<<<<< HEAD
         ],
+=======
+        ], */
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
         extras: [
             {
@@ -158,7 +206,11 @@ const SidePanel = ({
             },
             {
                 label: tt('g.sign_up'),
+<<<<<<< HEAD
                 link: 'https://signup.steemit.com',
+=======
+                link: 'https://www.blocktrades.us/create-steem-account',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             },
         ],
     };
@@ -167,13 +219,17 @@ const SidePanel = ({
         <div className="SidePanel">
             <div className={(visible ? 'visible ' : '') + alignment}>
                 <CloseButton onClick={hideSidePanel} />
+<<<<<<< HEAD
                 <ul className={`vertical menu ${loggedIn}`}>
                     {sidePanelLinks.extras.map(makeLink)}
                 </ul>
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 <ul className="vertical menu">
                     {sidePanelLinks.internal.map(makeLink)}
                 </ul>
                 <ul className="vertical menu">
+<<<<<<< HEAD
                     {sidePanelLinks.wallet.map(makeLink)}
                 </ul>
                 <ul className="vertical menu">
@@ -184,6 +240,18 @@ const SidePanel = ({
                 </ul>
                 <ul className="vertical menu">
                     {sidePanelLinks.legal.map(makeLink)}
+=======
+                    {sidePanelLinks.external.map(makeLink)}
+                </ul>
+                <ul className={`vertical menu ${loggedIn}`}>
+                    {sidePanelLinks.extras.map(makeLink)}
+                </ul>
+                <ul className="vertical menu">
+                    {sidePanelLinks.wallet.map(makeLink)}
+                </ul>
+                <ul className="vertical menu">
+                    {sidePanelLinks.organizational.map(makeLink)}
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 </ul>
             </div>
         </div>
diff --git a/src/app/components/modules/SidePanel/styles.scss b/src/app/components/modules/SidePanel/styles.scss
index 13da1d7446..165a947525 100644
--- a/src/app/components/modules/SidePanel/styles.scss
+++ b/src/app/components/modules/SidePanel/styles.scss
@@ -46,7 +46,11 @@ $menu-width: 250px;
         border-bottom: 1px solid $color-blue-black-darkest;
       }
     }
+<<<<<<< HEAD
     ul:nth-of-type(n+3) {
+=======
+    ul:nth-of-type(n+2) {
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
       margin-top: 2rem;
     }
 
diff --git a/src/app/components/pages/PostsIndex.jsx b/src/app/components/pages/PostsIndex.jsx
index 80e1bd24d9..be26b2c015 100644
--- a/src/app/components/pages/PostsIndex.jsx
+++ b/src/app/components/pages/PostsIndex.jsx
@@ -141,7 +141,11 @@ class PostsIndex extends React.Component {
         let page_title = tt('g.all_tags');
         if (order === 'feed') {
             if (account_name === this.props.username)
+<<<<<<< HEAD
                 page_title = 'My friends' || tt('posts_index.my_feed');
+=======
+                page_title = 'Feed' || tt('posts_index.my_feed');
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
             else
                 //page_title = tt('posts_index.accountnames_feed', {
                 //    account_name,
@@ -149,7 +153,11 @@ class PostsIndex extends React.Component {
                 //page_title = '@' + account_name + "'s friends"
                 page_title = 'My friends';
         } else if (category === 'my') {
+<<<<<<< HEAD
             page_title = 'My communities';
+=======
+            page_title = 'Communities Feed';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         } else if (community) {
             page_title = community.get('title');
         } else if (category) {
diff --git a/src/app/components/pages/Topics.jsx b/src/app/components/pages/Topics.jsx
index cd24836db8..a9134d6452 100644
--- a/src/app/components/pages/Topics.jsx
+++ b/src/app/components/pages/Topics.jsx
@@ -33,6 +33,7 @@ class Topics extends Component {
                 if (tag && tag[0] === '@')
                     return {
                         value: `/@${username}/feed`,
+<<<<<<< HEAD
                         label: 'My friends' || `tt('g.my_feed')`,
                     };
                 if (tag === 'my')
@@ -41,6 +42,16 @@ class Topics extends Component {
                     return {
                         value: `/communities`,
                         label: 'Explore Communities...',
+=======
+                        label: 'Feed' || `tt('g.my_feed')`,
+                    };
+                if (tag === 'my')
+                    return { value: `/trending/my`, label: 'Communities Feed' };
+                if (tag == 'explore')
+                    return {
+                        value: `/communities`,
+                        label: 'Explore Communities',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                     };
                 if (tag)
                     return {
@@ -111,10 +122,17 @@ class Topics extends Component {
             </div>
         );
 
+<<<<<<< HEAD
         const moreLabel = <span>{tt('g.show_more_topics')}&hellip;</span>;
         const title =
             subscriptions && username
                 ? 'My subscriptions'
+=======
+        const moreLabel = <span>{tt('g.show_more_topics')}</span>;
+        const title =
+            subscriptions && username
+                ? 'Subscriptions'
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 : 'Trending Communities';
         const commsHead = (
             <div style={{ color: '#aaa', paddingTop: '0em' }}>{title}</div>
@@ -122,10 +140,17 @@ class Topics extends Component {
         const list = (
             <ul className="c-sidebar__list">
                 <li>{link('/', tt('g.all_tags'))}</li>
+<<<<<<< HEAD
                 {username && (
                     <li>{link(`/@${username}/feed`, 'My friends')}</li>
                 )}
                 {username && <li>{link(`/trending/my`, 'My communities')}</li>}
+=======
+                {username && <li>{link(`/@${username}/feed`, 'Feed')}</li>}
+                {username && (
+                    <li>{link(`/trending/my`, 'Communities Feed')}</li>
+                )}
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
                 {(subscriptions || topics).size > 0 && <li>{commsHead}</li>}
                 {username &&
                     subscriptions &&
diff --git a/src/app/components/pages/Topics.scss b/src/app/components/pages/Topics.scss
index a467946834..54f566b035 100644
--- a/src/app/components/pages/Topics.scss
+++ b/src/app/components/pages/Topics.scss
@@ -17,5 +17,9 @@ ul.Topics {
 .c-sidebar__header {
   font-weight: bold;
   font-size: 1.125rem;
+<<<<<<< HEAD
   margin: 0 0 1rem 0;
+=======
+  margin: 0 0 0.5rem 0;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 }
diff --git a/src/app/help/en/tos.md b/src/app/help/en/tos.md
index 5a855a38e9..3f41ea5e48 100644
--- a/src/app/help/en/tos.md
+++ b/src/app/help/en/tos.md
@@ -1,8 +1,14 @@
 Last Updated June 15, 2018
 
+<<<<<<< HEAD
 Welcome to Steemit!  This agreement (the “Agreement”) between you and
 Steemit, Inc. (“we”, “us”, “our”) sets out your rights to access
 and use of steemit.com and any other products or services provided by us (the
+=======
+Welcome to Steem Town!  This agreement (the “Agreement”) between you and
+Steem Town (“we”, “us”, “our”) sets out your rights to access
+and use of steem.town and any other products or services provided by us (the
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 “Service”). If you are accepting this Agreement and using the Services on
 behalf of a company, organization, government, or other legal entity, you
 represent and warrant that you are authorized to do so and have the authority
@@ -11,7 +17,11 @@ that you have read, understood and accepted this Agreement.
 
 If we decide to make changes to this Agreement, we will provide notice of those
 changes by updating the “Last Updated” date above or posting notice on
+<<<<<<< HEAD
 steemit.com. Your continued use of the Service will confirm your acceptance of
+=======
+steem.town. Your continued use of the Service will confirm your acceptance of
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 the changes.
 
 ## 1. Privacy Policy
@@ -32,6 +42,7 @@ Agreement.
 
 We may retain data, text, photographs, images, video, audio, graphics,
 articles, comments, software, code, scripts, and other content supplied by us,
+<<<<<<< HEAD
 the Steem blockchain or our licensors, which we call “Steemit Content.”
 Steemit Content is protected by intellectual property laws, including copyright
 and other proprietary rights of the United States and foreign countries. Except
@@ -40,6 +51,16 @@ rights to use Steemit Content.
 
 You are granted a limited, non-exclusive, non-transferable, and
 non-sublicensable license to access and use the Service and Steemit Content for
+=======
+the Steem blockchain or our licensors, which we call “Steem Town Content.”
+Steem Town Content is protected by intellectual property laws, including copyright
+and other proprietary rights of the United States and foreign countries. Except
+as explicitly stated in this Agreement, we do not grant any express or implied
+rights to use Steem Town Content.
+
+You are granted a limited, non-exclusive, non-transferable, and
+non-sublicensable license to access and use the Service and Steem Town Content for
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 your personal use. You retain ownership of and responsibility for Content you
 create or own ("Your Content"). If you're posting anything you did not create
 yourself or do not own the rights to, you agree that you are responsible for
@@ -49,17 +70,30 @@ to Content you post.
 
 ## 4. Trademark Policy
 
+<<<<<<< HEAD
 “Steemit,”, the Steemit logo and any other product or service names, logos,
 slogans that may appear on the Service are trademarks of Steemit, Inc., and,
 may not be copied, imitated, or used, in whole or in part, unless explicitly
 permitted or without first receiving written permission from us to do so.  The
 look and feel of steemit.com and the Service is protected by copyright ©
 Steemit, Inc. All rights reserved. You may not duplicate, copy, or reuse any
+=======
+“Steem Town,”, the Steem Town logo and any other product or service names, logos,
+slogans that may appear on the Service are trademarks of Steem Town, and,
+may not be copied, imitated, or used, in whole or in part, unless explicitly
+permitted or without first receiving written permission from us to do so.  The
+look and feel of steem.town and the Service is protected by copyright ©
+Steem Town All rights reserved. You may not duplicate, copy, or reuse any
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 portion of the HTML/CSS, Javascript, or visual design elements or concepts
 without express written permission.
 
 We encourage third-party dapp developers building on top of the Steem
+<<<<<<< HEAD
 blockchain to reach out to legal@steemit.com for all branding and licensing
+=======
+blockchain to reach out to legal@steem.town for all branding and licensing
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 questions.
 
 All other trademarks, registered trademarks, product names and company names or
@@ -117,9 +151,15 @@ personal injury caused by negligence, fraudulent misrepresentation, or any
 other liability which may not otherwise be limited or excluded under United
 States law.
 
+<<<<<<< HEAD
 ## 6. Agreement to Hold Steemit, Inc. Harmless
 
 6.1. You agree to hold harmless Steemit, Inc. (and each of our officers,
+=======
+## 6. Agreement to Hold Steem Town Harmless
+
+6.1. You agree to hold harmless Steem Town (and each of our officers,
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 directors, members, employees, agents, and affiliates) from any claim, demand,
 action, damage, loss, cost, or expense, including without limitation reasonable
 legal fees, arising out, or relating to:
@@ -168,7 +208,11 @@ or unauthorized access to your Account, to the maximum extent permitted by law.
 Advances in code cracking or technical advances such as the development of
 quantum computers may present risks to the Services that you use and your
 Account, which could result in the theft or loss of your property. By using the
+<<<<<<< HEAD
 Service or accessing Steemit Content, you acknowledge these inherent risks.
+=======
+Service or accessing Steem Town Content, you acknowledge these inherent risks.
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 ## 9. The Services
 
@@ -276,7 +320,11 @@ or deprecate the Services.
 
 13.1. We may suspend or terminate your access to the Services in our sole
 discretion, immediately and without prior notice, and delete or deactivate your
+<<<<<<< HEAD
 steemit.com account and all related information and files in such without cost
+=======
+steem.town account and all related information and files in such without cost
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 to you, including, for instance, if you breach any term of this Agreement. In
 the event of termination, your access to the funds in your account will require
 you access to the Steem blockchain via the command line API or third party
@@ -318,7 +366,11 @@ Copyright Act ("DMCA"), and we retain the right to remove access to user
 content provided via the Service that we deem to be infringing the copyright of
 others. If you become aware of user content on the Service that infringes your
 copyright rights, you may submit a properly formatted DMCA request (see 17
+<<<<<<< HEAD
 U.S.C. § 512) to Steemit, Inc.
+=======
+U.S.C. § 512) to Steem Town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 Misrepresentations of infringement can result in liability for monetary
 damages. You may want to consult an attorney before taking any action pursuant
@@ -326,13 +378,21 @@ to the DMCA. A DMCA request can be sent to us via the contact information below:
 
 Copyright Agent
 
+<<<<<<< HEAD
 Steemit, Inc.
+=======
+Steem Town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 251 LITTLE FALLS DRIVE
 
 WILMINGTON, DE 19808
 
+<<<<<<< HEAD
 copyright@steemit.com
+=======
+copyright@steem.town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 Please send our Copyright Agent the following information:
 
@@ -405,32 +465,53 @@ and/or your violation of the rights of any third-party or person.
 
 ## 17. Disclaimers
 
+<<<<<<< HEAD
 To the fullest extent permitted by applicable law, the Service and the Steemit
+=======
+To the fullest extent permitted by applicable law, the Service and the Steem Town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 Content are provided on an “as is” and “as available” basis, without
 warranties of any kind, either express or implied, including, without
 limitation, implied warranties of merchantability, fitness for a particular
 purpose, title and non-infringement and any warranties implied by any course of
 performance or usage of trade. The company does not represent or warrant that
+<<<<<<< HEAD
 the Service and the Steemit Content: (a) will be secure or available at any
 time or location; (b) are accurate, complete, reliable, current, or error-free
 or that any defects or errors will be corrected; and (c) are free of viruses or
 other harmful components. Your use of the Service and Steemit Content is solely
+=======
+the Service and the Steem Town Content: (a) will be secure or available at any
+time or location; (b) are accurate, complete, reliable, current, or error-free
+or that any defects or errors will be corrected; and (c) are free of viruses or
+other harmful components. Your use of the Service and Steem Town Content is solely
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 at your own risk. Some jurisdictions do not allow the disclaimer of implied
 terms in contracts with consumers, so some or all of the disclaimers in this
 Section may not apply to you.
 
 ## 18. Limitation of liability
 
+<<<<<<< HEAD
 To the fullest extent permitted by applicable law, in no event shall Steemit,
 Inc. or the any related party to Steemit, Inc., that includes but is not
+=======
+To the fullest extent permitted by applicable law, in no event shall Steem Town or the any related party to Steem Town, that includes but is not
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 limited to, subsidiaries, vendors, or contractors, be liable for any special,
 indirect, incidental, consequential, exemplary or punitive damages, or any
 other damages of any kind, including, but not limited to, loss of use, loss of
 profits or loss of data, whether in an action in contract, tort (including, but
 not limited to, negligence) or otherwise, arising out of, or in any way
+<<<<<<< HEAD
 connected with, the use of, or inability to use, the Service or the Steemit
 Content. To the fullest extent permitted by applicable law, in no event shall
 the aggregate liability of Steemit, Inc. or any related party, whether in
+=======
+connected with, the use of, or inability to use, the Service or the Steem Town
+Content. To the fullest extent permitted by applicable law, in no event shall
+the aggregate liability of Steem Town or any related party, whether in
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 contract, warranty, tort (including negligence, whether active, passive or
 imputed), product liability, strict liability or other theory, arising out of
 or relating to the use of or inability to use of the Service
@@ -449,29 +530,49 @@ discontinuance of the Service.
 ## 20. Arbitration
 
 Please read the following section carefully because it requires you to
+<<<<<<< HEAD
 arbitrate certain disputes with Steemit, Inc. and limits the way you can seek
 relief from Steemit, Inc. If you do not agree with this Section 20, please
+=======
+arbitrate certain disputes with Steem Town and limits the way you can seek
+relief from Steem Town If you do not agree with this Section 20, please
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 discontinue using the Service.
 
 20.1. Binding Arbitration. Except for disputes in which either party seeks to
 bring an individual action in small claims court or seeks injunctive or other
 equitable relief for the alleged unlawful use of copyrights, trademarks, trade
+<<<<<<< HEAD
 names, logos, trade secrets or patents, you and Steemit, Inc.: (a) waive your
 right to have any and all disputes or Claims arising from this Agreement or
 Steemit, Inc. (collectively, “Disputes”) resolved in a court; and (b) waive
 your right to a jury trial. Instead, you and Steemit, Inc. will arbitrate
+=======
+names, logos, trade secrets or patents, you and Steem Town: (a) waive your
+right to have any and all disputes or Claims arising from this Agreement or
+Steem Town (collectively, “Disputes”) resolved in a court; and (b) waive
+your right to a jury trial. Instead, you and Steem Town will arbitrate
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 Disputes through binding arbitration (which is the referral of a Dispute to one
 or more persons charged with reviewing the Dispute and making a final and
 binding determination to resolve it, instead of having the Dispute decided by a
 judge or jury in court).
 
 20.2. No Class Arbitrations, Class Actions or Representative Actions. You agree
+<<<<<<< HEAD
 that any dispute is personal to you and Steemit, Inc. and that any such dispute
+=======
+that any dispute is personal to you and Steem Town and that any such dispute
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 will be resolved solely through individual arbitration and will not be brought
 as a class arbitration, class action or any other type of representative
 proceeding. Neither party agrees to class arbitration or to an arbitration in
 which an individual makes and attempt to resolve a dispute as a representative
+<<<<<<< HEAD
 of another individual or group of individuals. Further, you and Steemit, Inc.
+=======
+of another individual or group of individuals. Further, you and Steem Town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 agree that a dispute cannot be brought as a class, or other type of
 representative action, whether within or outside of arbitration, or on behalf
 of any other individual or group of individuals.
@@ -485,11 +586,19 @@ permitted by applicable law.
 20.4. Process. You agree that you will notify us in writing of any Dispute
 within thirty (30) days of when it arises so that the parties can attempt, in
 good faith, to resolve the Dispute informally. Notice to the us shall be
+<<<<<<< HEAD
 provided by sending an email to legal@steemit.com. Your notice must include:
 (1) your name, postal address, and email address; (2) a description of the
 nature or basis of the Dispute; and (3) the specific relief that you are
 seeking. If we cannot agree how to resolve the Dispute within thirty (30) days
 of the us receiving the notice, either you or Steemit, Inc. may, as appropriate
+=======
+provided by sending an email to legal@steem.town. Your notice must include:
+(1) your name, postal address, and email address; (2) a description of the
+nature or basis of the Dispute; and (3) the specific relief that you are
+seeking. If we cannot agree how to resolve the Dispute within thirty (30) days
+of the us receiving the notice, either you or Steem Town may, as appropriate
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 pursuant to this Section 20, commence an arbitration proceeding or file a claim
 in court. You agree that any arbitration or claim against us must be commenced
 or filed within one (1) year after the Dispute arose; otherwise, you agree that
@@ -529,7 +638,11 @@ enforceable, except as prohibited by applicable law.
 
 ## 21. Applicable Law and Venue
 
+<<<<<<< HEAD
 This Agreement and your access to and use of the Service and the Steemit
+=======
+This Agreement and your access to and use of the Service and the Steem Town
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 Content will be governed by, and construed in accordance with, the laws of New
 York, without resort to its conflict of law provisions. To the extent the
 arbitration provision in Section 20 does not apply and the Dispute cannot be
@@ -543,7 +656,11 @@ this Agreement.
 ## 22. Termination
 
 We reserve the right, without notice and in our sole discretion, to terminate
+<<<<<<< HEAD
 your license to access and use of the Service, which includes, steemit.com, and
+=======
+your license to access and use of the Service, which includes, steem.town, and
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 to block or prevent your future access to, and use of, the Service that we
 provide.
 
@@ -560,11 +677,19 @@ This Agreement is the entire agreement between you and us concerning the
 Service. It supersedes all prior or contemporaneous agreements between you and
 us. We may modify this user agreement at any time. If we make changes to this
 agreement that materially affect your rights, we will provide notice and keep
+<<<<<<< HEAD
 this edition available as an archive on steemit.com. By continuing to use the
+=======
+this edition available as an archive on steem.town. By continuing to use the
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 Services after a change to this agreement, you agree to those changes.
 
 ## 25. Contact Information
 
+<<<<<<< HEAD
 Notices to Steemit, Inc. should be directed to legal@steemit.com.
+=======
+Notices to Steem Town should be directed to legal@steem.town.
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 
diff --git a/src/app/locales/en.json b/src/app/locales/en.json
index 60452f90c4..c409cf4a5a 100644
--- a/src/app/locales/en.json
+++ b/src/app/locales/en.json
@@ -71,7 +71,11 @@
         "mute": "Mute",
         "my_blog": "My blog",
         "my_comments": "My comments",
+<<<<<<< HEAD
         "my_feed": "My feed",
+=======
+        "my_feed": "Feed",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         "my_replies": "Replies to me",
         "my_wallet": "My wallet",
         "new": "New",
@@ -144,7 +148,11 @@
         "to": " to ",
         "topics": "Topics",
         "toggle_nightmode": "Night Mode",
+<<<<<<< HEAD
         "all_tags": "All posts",
+=======
+        "all_tags": "All Posts",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         "all_tags_mobile": "All posts",
         "transfer": "Transfer ",
         "trending_topics": "Trending Topics",
@@ -260,7 +268,11 @@
         "read_only_mode":
             "Due to server maintenance we are running in read only mode. We are sorry for the inconvenience.",
         "tags_and_topics": "Tags",
+<<<<<<< HEAD
         "show_more_topics": "Explore communities",
+=======
+        "show_more_topics": "Explore Communities",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         "basic": "Basic",
         "advanced": "Advanced",
         "views": {
@@ -300,6 +312,12 @@
         "learn_more": "Learn more",
         "welcome": "Welcome",
         "faq": "FAQ",
+<<<<<<< HEAD
+=======
+        "blockexplorer": "Blockexplorer",
+        "what_is_steem": "What is Steem?",
+        "steem_engine": "Steem Engine",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         "chat": "Steem Chat",
         "app_center": "Apps Built on Steem",
         "business_center": "Businesses Accepting Steem",
@@ -584,7 +602,11 @@
         "empty_feed_3": "Explore Trending Articles",
         "empty_feed_4": "Read The Quick Start Guide",
         "empty_feed_5": "Browse The FAQ",
+<<<<<<< HEAD
         "my_feed": "My Feed",
+=======
+        "my_feed": "Feed",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         "accountnames_feed": "%(account_name)s's Feed"
     },
     "explorepost_jsx": {
diff --git a/src/app/locales/fr.json b/src/app/locales/fr.json
index 2a742c1240..0588989149 100644
--- a/src/app/locales/fr.json
+++ b/src/app/locales/fr.json
@@ -47,7 +47,11 @@
         "mute": "Ignorer",
         "my_blog": "Mon blog",
         "my_comments": "Mes commentaires",
+<<<<<<< HEAD
         "my_feed": "Mon flux",
+=======
+        "my_feed": "Flux",
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         "my_replies": "Réponses à moi",
         "my_wallet": "Mon portefeuille",
         "new": "nouveau",
@@ -537,7 +541,11 @@
         "empty_feed_3": "Explorer les articles en vogue",
         "empty_feed_4": "Lire le guide de prise en main rapide",
         "empty_feed_5": "Parcourir la FAQ",
+<<<<<<< HEAD
         "my_feed": "Mon Flux"
+=======
+        "my_feed": "Flux"
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     },
     "explorepost_jsx": {
         "copied": "Copié!",
diff --git a/src/app/utils/AffiliationMap.js b/src/app/utils/AffiliationMap.js
index f02f1b4f38..d8daa6280e 100644
--- a/src/app/utils/AffiliationMap.js
+++ b/src/app/utils/AffiliationMap.js
@@ -1,6 +1,11 @@
 const map = {
     //steemit
+<<<<<<< HEAD
     justinw: 'steemit',
+=======
+    // TODO: add here
+    /* justinw: 'steemit',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     elipowell: 'steemit',
     vandeberg: 'steemit',
     gerbino: 'steemit',
@@ -8,8 +13,12 @@ const map = {
     roadscape: 'steemit',
     steemitblog: 'steemit',
     steemitdev: 'steemit',
+<<<<<<< HEAD
     justinsunsteemit: 'steemit',
 
+=======
+    justinsunsteemit: 'steemit', */
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     /*
     //steem monsters
     steemmonsters: 'sm',
diff --git a/src/app/utils/CanonicalLinker.js b/src/app/utils/CanonicalLinker.js
index 1b1bd00ce1..9818a2a719 100644
--- a/src/app/utils/CanonicalLinker.js
+++ b/src/app/utils/CanonicalLinker.js
@@ -32,7 +32,17 @@ function build_scheme(scheme, post) {
 
 function allowed_app(app) {
     // apps which follow (reciprocate) canonical URLs (as of 2019-10-15)
+<<<<<<< HEAD
     const whitelist = ['steemit', 'esteem', 'steempeak', 'travelfeed'];
+=======
+    const whitelist = [
+        'steemtown',
+        'steemit',
+        'esteem',
+        'steempeak',
+        'travelfeed',
+    ];
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     return whitelist.includes(app);
 }
 
@@ -48,6 +58,10 @@ export function makeCanonicalLink(post, metadata) {
             scheme = Apps[app] ? Apps[app].url_scheme : null;
         }
     }
+<<<<<<< HEAD
     if (!scheme) scheme = Apps['steemit'].url_scheme;
+=======
+    if (!scheme) scheme = Apps['steemtown'].url_scheme;
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     return build_scheme(scheme, post);
 }
diff --git a/src/app/utils/CanonicalLinker.test.js b/src/app/utils/CanonicalLinker.test.js
index df2bb691a4..d0f9329bdc 100644
--- a/src/app/utils/CanonicalLinker.test.js
+++ b/src/app/utils/CanonicalLinker.test.js
@@ -11,22 +11,38 @@ describe('makeCanonicalLink', () => {
         [
             'handles posts without app',
             { ...post_data, json_metadata: {} },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
         [
             'handles empty strings as app',
             { ...post_data, json_metadata: { app: '' } },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
         [
             "handles apps that don't exist",
             { ...post_data, json_metadata: { app: 'fakeapp/1.2.3' } },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
         [
             "handles app that don't exist without version",
             { ...post_data, json_metadata: { app: 'fakeapp' } },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
         [
             'handles apps that do exist',
@@ -36,17 +52,29 @@ describe('makeCanonicalLink', () => {
         [
             'handles posts from steemit',
             { ...post_data, json_metadata: { app: 'steemit/0.1' } },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
         [
             'handles badly formatted app strings',
             { ...post_data, json_metadata: { app: 'fakeapp/0.0.1/a////' } },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
         [
             'handles objects as apps',
             { ...post_data, json_metadata: { app: { this_is: 'an objct' } } },
+<<<<<<< HEAD
             'https://steemit.com/testing/@test/test-post',
+=======
+            'https://steem.town/testing/@test/test-post',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
         ],
     ];
     test_cases.forEach(v => {
diff --git a/src/app/utils/ExtractMeta.js b/src/app/utils/ExtractMeta.js
index 1daa681493..c934a6865b 100644
--- a/src/app/utils/ExtractMeta.js
+++ b/src/app/utils/ExtractMeta.js
@@ -6,6 +6,7 @@ const site_desc =
     'Communities without borders. A social network owned and operated by its users, powered by Steem.';
 
 function addSiteMeta(metas) {
+<<<<<<< HEAD
     metas.push({ title: 'Steemit' });
     metas.push({ name: 'description', content: site_desc });
     metas.push({ property: 'og:type', content: 'website' });
@@ -24,6 +25,28 @@ function addSiteMeta(metas) {
     metas.push({
         name: 'twitter:image',
         content: 'https://steemit.com/images/steemit.png',
+=======
+    metas.push({ title: 'Steem Town' });
+    metas.push({ name: 'description', content: site_desc });
+    metas.push({ property: 'og:type', content: 'website' });
+    metas.push({ property: 'og:site_name', content: 'Steem Town' });
+    metas.push({ property: 'og:title', content: 'Steem Town' });
+    metas.push({ property: 'og:description', content: site_desc });
+    metas.push({
+        property: 'og:image',
+        content:
+            'https://steem.town/images/favicons/android-chrome-512x512.png',
+    });
+    metas.push({ property: 'fb:app_id', content: $STM_Config.fb_app });
+    metas.push({ name: 'twitter:card', content: 'summary' });
+    metas.push({ name: 'twitter:site', content: '@steemtown' });
+    metas.push({ name: 'twitter:title', content: '#SteemTown' });
+    metas.push({ name: 'twitter:description', site_desc });
+    metas.push({
+        name: 'twitter:image',
+        content:
+            'https://steem.town/images/favicons/android-chrome-512x512.png',
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     });
 }
 
@@ -32,7 +55,11 @@ function addPostMeta(metas, content, profile) {
     const { category, created, body, json_metadata } = content;
     const isReply = content.depth > 0;
 
+<<<<<<< HEAD
     const title = content.title + ' — Steemit';
+=======
+    const title = content.title + ' — Steem Town';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     const desc = extractBodySummary(body, isReply) + ' by ' + content.author;
     const image_link = extractImageLink(json_metadata, body);
 
@@ -51,10 +78,19 @@ function addPostMeta(metas, content, profile) {
     metas.push({ name: 'og:url', content: localUrl });
     metas.push({
         name: 'og:image',
+<<<<<<< HEAD
         content: image || 'https://steemit.com/images/steemit.png',
     });
     metas.push({ name: 'og:description', content: desc });
     metas.push({ name: 'og:site_name', content: 'Steemit' });
+=======
+        content:
+            image ||
+            'https://steem.town/images/favicons/android-chrome-512x512.png',
+    });
+    metas.push({ name: 'og:description', content: desc });
+    metas.push({ name: 'og:site_name', content: 'Steem Town' });
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     metas.push({ name: 'fb:app_id', content: $STM_Config.fb_app });
     metas.push({ name: 'article:tag', content: category });
     metas.push({
@@ -67,7 +103,11 @@ function addPostMeta(metas, content, profile) {
         name: 'twitter:card',
         content: image ? 'summary_large_image' : 'summary',
     });
+<<<<<<< HEAD
     metas.push({ name: 'twitter:site', content: '@steemit' });
+=======
+    metas.push({ name: 'twitter:site', content: '@steemtown' });
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     metas.push({ name: 'twitter:title', content: title });
     metas.push({ name: 'twitter:description', content: desc });
     metas.push({
@@ -82,7 +122,11 @@ function addAccountMeta(metas, accountname, profile) {
     name = name || accountname;
     about = about || 'Steemit: Communities Without Borders.';
     profile_image =
+<<<<<<< HEAD
         profile_image || 'https://steemit.com/images/steemit-twshare-2.png';
+=======
+        profile_image || 'https://steem.town/images/steemit-twshare-2.png';
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
     // Set profile tags
     const title = `@${accountname}`;
@@ -95,7 +139,11 @@ function addAccountMeta(metas, accountname, profile) {
 
     // Twitter card data
     metas.push({ name: 'twitter:card', content: 'summary' });
+<<<<<<< HEAD
     metas.push({ name: 'twitter:site', content: '@steemit' });
+=======
+    metas.push({ name: 'twitter:site', content: '@steemtown' });
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     metas.push({ name: 'twitter:title', content: title });
     metas.push({ name: 'twitter:description', content: desc });
     metas.push({ name: 'twitter:image', content: profile_image });
diff --git a/yarn.lock b/yarn.lock
index d070999f53..b669f8ee71 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -328,6 +328,19 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.1.5, ajv@^5.2.0, ajv@^5.2.3:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+<<<<<<< HEAD
+=======
+ajv@^6.5.5:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
+  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -616,6 +629,14 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+<<<<<<< HEAD
+=======
+aws4@^1.8.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e"
+  integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 axios@^0.18.0:
   version "0.18.0"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
@@ -2262,6 +2283,16 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
+<<<<<<< HEAD
+=======
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
+  dependencies:
+    delayed-stream "~1.0.0"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 commander@^2.11.0, commander@^2.12.2, commander@^2.9.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.0.tgz#7b25325963e6aace20d3a9285b09379b0c2208b5"
@@ -3498,6 +3529,14 @@ extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
+<<<<<<< HEAD
+=======
+extend@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 external-editor@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
@@ -3529,6 +3568,14 @@ fast-deep-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
+<<<<<<< HEAD
+=======
+fast-deep-equal@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
+  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -3735,6 +3782,18 @@ form-data@~2.3.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+<<<<<<< HEAD
+=======
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.6"
+    mime-types "^2.1.12"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 formatio@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
@@ -3849,6 +3908,7 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
+<<<<<<< HEAD
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
@@ -3859,6 +3919,8 @@ generate-object-property@^1.1.0:
   dependencies:
     is-property "^1.0.0"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 get-caller-file@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
@@ -4019,6 +4081,7 @@ har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
 
+<<<<<<< HEAD
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
@@ -4028,6 +4091,8 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 har-validator@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
@@ -4042,6 +4107,17 @@ har-validator@~5.0.3:
     ajv "^5.1.0"
     har-schema "^2.0.0"
 
+<<<<<<< HEAD
+=======
+har-validator@~5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+  dependencies:
+    ajv "^6.5.5"
+    har-schema "^2.0.0"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -4607,6 +4683,7 @@ is-image@^1.0.1:
   dependencies:
     image-extensions "^1.0.1"
 
+<<<<<<< HEAD
 is-my-ip-valid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
@@ -4621,6 +4698,8 @@ is-my-json-valid@^2.12.4:
     jsonpointer "^4.0.0"
     xtend "^4.0.0"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 is-number-object@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
@@ -4685,10 +4764,13 @@ is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
 
+<<<<<<< HEAD
 is-property@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -5207,6 +5289,14 @@ json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
 
+<<<<<<< HEAD
+=======
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -5239,10 +5329,13 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+<<<<<<< HEAD
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 jsprim@^1.2.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
@@ -5646,7 +5739,11 @@ lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
 
+<<<<<<< HEAD
 lodash.assign@^4.0.0, lodash.assign@^4.2.0:
+=======
+lodash.assign@^4.0.0:
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
@@ -5664,10 +5761,13 @@ lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
 
+<<<<<<< HEAD
 lodash.clonedeep@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 lodash.cond@^4.3.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5"
@@ -5734,10 +5834,13 @@ lodash.merge@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
   integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
 
+<<<<<<< HEAD
 lodash.mergewith@^4.6.0:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 lodash.pick@^4.2.1, lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -5789,6 +5892,14 @@ lodash@^4.16.4, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
+<<<<<<< HEAD
+=======
+lodash@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 log-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
@@ -5971,6 +6082,14 @@ mime-db@1.40.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
+<<<<<<< HEAD
+=======
+mime-db@1.43.0:
+  version "1.43.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
+  integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 "mime-db@>= 1.30.0 < 2", mime-db@~1.30.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
@@ -5988,6 +6107,16 @@ mime-types@^2.1.11:
   dependencies:
     mime-db "1.40.0"
 
+<<<<<<< HEAD
+=======
+mime-types@~2.1.19:
+  version "2.1.26"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
+  integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
+  dependencies:
+    mime-db "1.43.0"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
@@ -6096,7 +6225,16 @@ mz@~2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+<<<<<<< HEAD
 nan@^2.10.0, nan@^2.3.0, nan@^2.3.3:
+=======
+nan@^2.13.2:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
+
+nan@^2.3.0, nan@^2.3.3:
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -6148,19 +6286,33 @@ node-fetch@1.7.3, node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+<<<<<<< HEAD
 node-gyp@^3.3.1:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
+=======
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   dependencies:
     fstream "^1.0.0"
     glob "^7.0.3"
     graceful-fs "^4.1.2"
+<<<<<<< HEAD
     minimatch "^3.0.2"
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     mkdirp "^0.5.0"
     nopt "2 || 3"
     npmlog "0 || 1 || 2 || 3 || 4"
     osenv "0"
+<<<<<<< HEAD
     request "2"
+=======
+    request "^2.87.0"
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     rimraf "2"
     semver "~5.3.0"
     tar "^2.0.0"
@@ -6223,9 +6375,16 @@ node-pre-gyp@^0.6.39:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
+<<<<<<< HEAD
 node-sass@4.9.0:
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52"
+=======
+node-sass@^4.13.1:
+  version "4.13.1"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
+  integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6234,6 +6393,7 @@ node-sass@4.9.0:
     get-stdin "^4.0.1"
     glob "^7.0.3"
     in-publish "^2.0.0"
+<<<<<<< HEAD
     lodash.assign "^4.2.0"
     lodash.clonedeep "^4.3.2"
     lodash.mergewith "^4.6.0"
@@ -6243,6 +6403,15 @@ node-sass@4.9.0:
     node-gyp "^3.3.1"
     npmlog "^4.0.0"
     request "~2.79.0"
+=======
+    lodash "^4.17.15"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
     sass-graph "^2.2.4"
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
@@ -6354,6 +6523,14 @@ oauth-sign@~0.8.1, oauth-sign@~0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
+<<<<<<< HEAD
+=======
+oauth-sign@~0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+  integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 object-assign@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
@@ -7110,6 +7287,14 @@ pseudomap@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
+<<<<<<< HEAD
+=======
+psl@^1.1.28:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"
+  integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 public-encrypt@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
@@ -7132,6 +7317,14 @@ punycode@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
 
+<<<<<<< HEAD
+=======
+punycode@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -7149,14 +7342,25 @@ qs@6.5.1, qs@^6.1.0, qs@^6.4.0, qs@^6.5.1, qs@~6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
 
+<<<<<<< HEAD
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+<<<<<<< HEAD
+=======
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 query-string@^4.1.0, query-string@^4.2.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -7832,7 +8036,11 @@ request-promise-native@^1.0.5:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
+<<<<<<< HEAD
 request@*, request@2, request@^2.79.0, request@^2.83.0:
+=======
+request@*, request@^2.79.0, request@^2.83.0:
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
   version "2.85.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
   dependencies:
@@ -7886,6 +8094,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+<<<<<<< HEAD
 request@~2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
@@ -7910,6 +8119,33 @@ request@~2.79.0:
     tough-cookie "~2.3.0"
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
+=======
+request@^2.87.0, request@^2.88.0:
+  version "2.88.2"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
+  integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.8.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.6"
+    extend "~3.0.2"
+    forever-agent "~0.6.1"
+    form-data "~2.3.2"
+    har-validator "~5.1.3"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.19"
+    oauth-sign "~0.9.0"
+    performance-now "^2.1.0"
+    qs "~6.5.2"
+    safe-buffer "^5.1.2"
+    tough-cookie "~2.5.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.3.2"
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 
 require-directory@^2.1.1:
   version "2.1.1"
@@ -8047,6 +8283,14 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+<<<<<<< HEAD
+=======
+safe-buffer@^5.1.2:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
+  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
@@ -8840,6 +9084,17 @@ tough-cookie@>=2.3.3, tough-cookie@^2.3.2, tough-cookie@^2.3.3, tough-cookie@~2.
   dependencies:
     punycode "^1.4.1"
 
+<<<<<<< HEAD
+=======
+tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 tr46@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -8878,10 +9133,13 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+<<<<<<< HEAD
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
 
+=======
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
@@ -8997,6 +9255,16 @@ unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+<<<<<<< HEAD
+=======
+uri-js@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  dependencies:
+    punycode "^2.1.0"
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 url-loader@0.6.2, url-loader@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.6.2.tgz#a007a7109620e9d988d14bce677a1decb9a993f7"
@@ -9045,6 +9313,14 @@ uuid@^3.0.0, uuid@^3.1.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
 
+<<<<<<< HEAD
+=======
+uuid@^3.3.2:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
+>>>>>>> 1bc71ede40cbd3af6dd3c52b00dfd57e7324901b
 v8flags@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"