fixed merge conflict

src/index.js

@@ -5,7 +5,6 @@ import { createStore, applyMiddleware } from 'redux'
 import ReduxThunk from 'redux-thunk'
 import '@babel/polyfill'
 
-<<<<<<< HEAD
 import reducers from './store/reducers'
 import AppRouter from './AppRouter'
 
@@ -15,11 +14,6 @@ import 'swiper/css/navigation'
 import 'swiper/css/pagination'
 // Import main sass file to apply global styles
 import './static/sass/style.scss'
-=======
-import App from './containers/App';
-import 'swiper/swiper-bundle.min.css';
-import './static/sass/style.scss';
->>>>>>> 4ee9fd3d7103a246e24a324f01ff488928ad864c
 
 const store = createStore(reducers, applyMiddleware(ReduxThunk))