solve conflict

build/manifest.json

+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}

src/components/video/camp/campResolve.js

@@ -35,7 +35,6 @@ class CampResolve extends Component {
             this.body = document.getElementsByTagName('body')[0];
             this.body.style.position = 'static';
         } else {
-<<<<<<< HEAD
             const { history, location: { state={} } } = this.props;
             let to = '';
             if(state.from && state.from.indexOf('video') !== -1) {
@@ -51,9 +50,6 @@ class CampResolve extends Component {
                     to
                 }
             );
-=======
-            this.props.history.push(`${this.props.location.state.from}`,{href: '/purchased'})
->>>>>>> ef91ba3d8a0a94933546e5e626e4683a35469b0d
         }
     };
     componentDidMount() {