Conflict search for GeoCloud2 added