title: npm errors after git merge with conflicts
body: <p>So, I am using React, create-react-app to be precise.</p>
  
  <p>Main question: How do I get React back to work? I am pretty much a beginner with npm / React, so I don't know where to begin troubleshooting this.</p>
  
  <p>After manually merging a branch that was made 20 days ago, which caused some merge conflicts, I get the following error when starting up the React dev server (npm start).</p>
  
  <p>One of the merge conflicts was in package.json, so that might be where the problem originates from. I'll post my package.json file at the bottom.</p>
  
  <pre><code>Module not found: Can't resolve 'styled-components' in 'C:\Users\riksch\Documents\MEGAsync\projects\Current\greenery-marketplace\frontend\src'
  </code></pre>
  
  <p>So, I tried re-installing it. Still the same error.</p>
  
  <p>Then I googled some, and found a way to list my installed packages, so I ran:</p>
  
  <pre><code>npm list --depth=0
  </code></pre>
  
  <p>This shows some errors:</p>
  
  <pre><code>+-- axios@0.18.0
  +-- jquery@3.3.1
  +-- js-cookie@2.2.0
  +-- UNMET PEER DEPENDENCY react@16.2.0
  +-- react-dom@16.2.0
  +-- react-form@3.5.5
  +-- react-intl@2.4.0
  +-- react-route@1.0.3
  +-- react-router-dom@4.2.2
  +-- react-scripts@1.1.1
  +-- react-strap@0.0.1
  +-- reactstrap@6.0.1
  `-- UNMET DEPENDENCY styled-components@^3.3.2
  
  npm ERR! peer dep missing: react@^0.13.3 || ^0.14.0-rc1, required by react-route@1.0.3
  npm ERR! missing: styled-components@^3.3.2, required by frontend@0.1.0
  npm ERR! peer dep missing: ajv@^6.0.0, required by ajv-keywords@3.1.0
  </code></pre>
  
  <p>Then I tried updating npm, hoping that would help.</p>
  
  <pre><code>npm update -g --verbose
  </code></pre>
  
  <p>I also tried putting packages in different orders in the package.json file. That didn't seem to help. Then I tried uninstalling styled-components, but that gives another error:</p>
  
  <pre><code>npm ERR! Unexpected string in JSON at position 332738
  
  npm ERR! A complete log of this run can be found in:
  npm ERR!     C:\Users\riksch\AppData\Roaming\npm-cache\_logs\2018-06-19T19_56_05_969Z-debug.log
  </code></pre>
  
  <p>Trying to install styled-components again gives me this:</p>
  
  <p>npm ERR! Unexpected string in JSON at position 332738</p>
  
  <pre><code>npm ERR! A complete log of this run can be found in:
  npm ERR!     C:\Users\riksch\AppData\Roaming\npm-cache\_logs\2018-06-19T19_56_21_076Z-debug.log
  PS C:\Users\riksch\Documents\MEGAsync\projects\Current\greenery-marketplace\frontend&gt;
  </code></pre>
  
  <p>package.json:</p>
  
  <pre><code>{
    "name": "frontend",
    "version": "0.1.0",
    "private": true,
    "dependencies": {
      "axios": "^0.18.0",
      "jquery": "^3.3.1",
      "js-cookie": "^2.2.0",
      "react": "^16.2.0",
      "react-dom": "^16.2.0",
      "react-form": "^3.5.5",
      "react-intl": "^2.4.0",
      "react-route": "^1.0.3",
      "react-router-dom": "^4.2.2",
      "react-scripts": "1.1.1",
      "styled-components": "^3.3.2",
      "react-strap": "0.0.1",
      "reactstrap": "^6.0.1"
    },
    "scripts": {
      "start": "react-scripts start",
      "build": "react-scripts build",
      "test": "react-scripts test --env=jsdom",
      "eject": "react-scripts eject"
    }
  }
  </code></pre>
  
  <p>package.json with unresolved merge conflict:</p>
  
  <pre><code>{
    "name": "frontend",
    "version": "0.1.0",
    "private": true,
    "dependencies": {
      "axios": "^0.18.0",
      "jquery": "^3.3.1",
      "js-cookie": "^2.2.0",
      "react": "^16.2.0",
      "react-dom": "^16.2.0",
      "react-form": "^3.5.5",
      "react-intl": "^2.4.0",
      "react-route": "^1.0.3",
      "react-router-dom": "^4.2.2",
      "react-scripts": "1.1.1",
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
      "styled-components": "^3.3.2"
  =======
      "react-strap": "0.0.1",
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; contact-form
      "reactstrap": "^6.0.1"
    },
    "scripts": {
      "start": "react-scripts start",
      "build": "react-scripts build",
      "test": "react-scripts test --env=jsdom",
      "eject": "react-scripts eject"
    }
  }
  </code></pre>
  
  <p>Now I don't want to mess things up even more. So I'm posting my question here:</p>
  
  <p><strong>How do I get React back to work? I am pretty much a beginner with npm / React, so I don't know where to begin troubleshooting this.</strong></p>