feat: display cities name on conflict
feat: display cities name on conflict

bagage/cadastre-conflation,bagage/cadastre-conflation,bagage/cadastre-conflation,bagage/cadastre-conflation,bagage/cadastre-conflation