diff --git a/packages/common/business_components/src/ui/map/lib/gis.layer.js b/packages/common/business_components/src/ui/map/lib/gis.layer.js
index 5f741e75f..9a7ffe55b 100644
--- a/packages/common/business_components/src/ui/map/lib/gis.layer.js
+++ b/packages/common/business_components/src/ui/map/lib/gis.layer.js
@@ -688,8 +688,6 @@ GisOlLayer.prototype = {
 		});
 
 		return source;
-<<<<<<< HEAD
-=======
 	},
 	/**
  * 여러 개의 검색 결과를 GeoJSON으로 표시
@@ -795,7 +793,6 @@ GisOlLayer.prototype = {
 		}
 		if (!isFinite(minX) || !isFinite(minY) || !isFinite(maxX) || !isFinite(maxY)) return null;
 		return [minX, minY, maxX, maxY];
->>>>>>> iipbs/common/main
 	}
 };