Merge conflicts in App.js file in src folder

[arteevraina]

./src/App.js
  Line 2:2:  Parsing error: Unexpected token

  1 | import React from 'react';
> 2 | <<<<<<< HEAD
    |  ^
  3 | import {Switch, Route, Redirect} from 'react-router-dom'
  4 | import Frame from './components/frame/Index'
  5 | import 'antd/dist/antd.css';

I think these may be left in the recent merges.