resolve the merge conflict in amcl_colibri_carto.launch
resolve the merge conflict in amcl_colibri_carto.launch

shevchenco123/28-Mansions,shevchenco123/28-Mansions,shevchenco123/28-Mansions,shevchenco123/28-Mansions,shevchenco123/28-Mansions