fix conflict

core/src/main/java/com/mooctest/crowd/domain/dao/CrowdTestProjectDao.java

@@ -2,11 +2,7 @@ package com.mooctest.crowd.domain.dao;
 
 import com.mooctest.crowd.domain.model.CrowdTestProjectPO;
 import com.mooctest.crowd.domain.model.RankInfo;
-<<<<<<< HEAD
 import com.mooctest.crowd.domain.model.RankInfos;
-=======
-import com.mooctest.crowd.domain.model.TechnicalArticlesPO;
->>>>>>> 787ffae43e39377b3c3024cdf1d4e2e71cbb7a65
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;