diff --git a/src/main/java/nlib/col/service/InterestService.java b/src/main/java/nlib/col/service/InterestService.java
index a3e58d12..04f50bdc 100644
--- a/src/main/java/nlib/col/service/InterestService.java
+++ b/src/main/java/nlib/col/service/InterestService.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package nlib.col.service;
 
 import java.util.List;
@@ -20,27 +19,4 @@ public interface InterestService
 
 	public List<DeptVO> selectOrgList(CollectionVO vo);
 
-=======
-package nlib.col.service;
-
-import java.util.List;
-
-import nlib.restful.service.DataApiReqVO;
-import nlib.restful.service.DataApiResVO;
-
-public interface InterestService
-{
-	public List<CollectionVO> listInterests(CollectionVO vo);
-	
-	public int countListInterests(CollectionVO vo);
-	
-	public void deleteInterests(List<Integer> mbInterestIdList, String mbInfoId);
-	
-	public void insertInterest(CollectionVO vo);
-
-	public int countInterest(CollectionVO vo);
-
-	public List<DeptVO> selectOrgList(CollectionVO vo);
-
->>>>>>> refs/remotes/origin/master
 }
\ No newline at end of file
diff --git a/src/main/java/nlib/col/service/impl/InterestServiceImpl.java b/src/main/java/nlib/col/service/impl/InterestServiceImpl.java
index 40443622..efc32562 100644
--- a/src/main/java/nlib/col/service/impl/InterestServiceImpl.java
+++ b/src/main/java/nlib/col/service/impl/InterestServiceImpl.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package nlib.col.service.impl;
 
 import java.util.List;
@@ -80,87 +79,4 @@ public class InterestServiceImpl implements InterestService
 	public List<DeptVO> selectOrgList(CollectionVO vo) {
 		return interestDAO.selectOrgList(vo);
 	}
-=======
-package nlib.col.service.impl;
-
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import nlib.col.service.CartService;
-import nlib.col.service.CollectionVO;
-import nlib.col.service.DeptVO;
-import nlib.col.service.InterestService;
-import nlib.restful.service.DataApiReqVO;
-import nlib.restful.service.DataApiResVO;
-
-@Service("interestService")
-public class InterestServiceImpl implements InterestService
-{
-	private static final Logger log = LoggerFactory.getLogger(InterestServiceImpl.class);
-	
-	@Resource(name="interestDAO")
-	private InterestDAO interestDAO;
-	
-	/* 
-	 * 관심자료 목록을 조회한다.
-	 * 
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#listInterests(nlib.restful.service.DataApiReqVO)
-	 */
-	public List<CollectionVO> listInterests(CollectionVO vo)  {
-		return interestDAO.listInterests(vo);
-	}
-	/* 
-	 * 관심자료목록의 총 개수를 조회한다.
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#countListInterests(nlib.col.service.CollectionVO)
-	 */
-	public int countListInterests(CollectionVO vo) {
-		return interestDAO.countListInterests(vo);
-	}
-	/* 
-	 * 관심자료 목록 삭제
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#deleteInterests(java.util.List)
-	 */
-	public void deleteInterests(List<Integer> mbInterestIdList,String mbInfoId) {
-		CollectionVO vo = new CollectionVO();
-		vo.setMbInfoId(mbInfoId);
-		
-		for(Integer mbInterestId : mbInterestIdList) {
-			vo.setMbInterestId(mbInterestId);
-			interestDAO.deleteInterests(vo);
-        }
-	}
-	/* 
-	 * 관심자료 추가시 중복체크용 count
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#countInterest(nlib.col.service.CollectionVO)
-	 */
-	public int countInterest(CollectionVO vo) {
-		return interestDAO.countInterest(vo);
-	}
-
-	/* 
-	 * 관심자료 추가
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#insertInterest(nlib.col.service.CollectionVO)
-	 */
-	public void insertInterest(CollectionVO vo) {
-		interestDAO.insertInterest(vo);
-	}
-	/* 
-	 * 문화원 목록 조회
-	 * (non-Javadoc)
-	 * @see nlib.col.service.CollectionService#selectOrgList()
-	 */
-	public List<DeptVO> selectOrgList(CollectionVO vo) {
-		return interestDAO.selectOrgList(vo);
-	}
->>>>>>> refs/remotes/origin/master
 }
\ No newline at end of file