在最后将分支上的内容合并到主分支的时候报错，不知道是哪里出错了？

$ git merge city-router
Auto-merging src/router/index.js
CONFLICT (content): Merge conflict in src/router/index.js
Auto-merging src/pages/home/components/header.vue
Automatic merge failed; fix conflicts and then commit the result.

并且index.js突然加上了很多>>>：

import Vue from 'vue'
import Router from 'vue-router'
import Home from '../pages/home/Home.vue'
import City from '../pages/city/City.vue'

Vue.use(Router)

export default new Router({
  routes: [
    {
      path: '/',
      name: 'Home',
      component: Home
    },{
      path: '/city',
      name: 'City',
      component: City
<<<<<<< HEAD
    }]
=======
    }
  ]
>>>>>>> city-router
})