Migration checker to upgrade Elasticsearch 1.7.1 to 2.1

I ran the migration checker on my Cluster running version 1.7.1 and I get a RED color output error:

Index: .kibana
Conflicting field mappings
Mapping for field dashboard:hits conflicts with: search:hits. Check parameter: type

I am running Kibana 4.1.2, how do I fix this so I can move forward with the upgrade.
Here is few lines from .kibana index
curl localhost:9200/.kibana?pretty

"dashboard" : {
"properties" : {
"description" : {
"type" : "string"
},
"hits" : {
"type" : "long"

"search" : {
"properties" : {
"columns" : {
"type" : "string"
},
"description" : {
"type" : "string"
},
"hits" : {
"type" : "integer"

Please advice
Thanks