diff --git a/apirouter/entry.go b/apirouter/entry.go
index a3de109..ffa065b 100644
--- a/apirouter/entry.go
+++ b/apirouter/entry.go
@@ -3,11 +3,7 @@ package apirouter
 import (
 	"key_performance_indicators/apirouter/apishiyan"
 	"key_performance_indicators/apirouter/empower"
-<<<<<<< HEAD
-	mytest "key_performance_indicators/apirouter/myTest"
-=======
 	"key_performance_indicators/apirouter/v1/departmentseting"
->>>>>>> v1_dev
 	honorsRoute "key_performance_indicators/apirouter/v1/honorsRoute"
 	"key_performance_indicators/apirouter/v1/postseting"
 	"key_performance_indicators/apirouter/verifyLogin"
@@ -20,12 +16,8 @@ type RouterGroup struct {
 	VerifyLogin       verifyLogin.ApiRouter
 	ShiyanApi         apishiyan.ApiRouter
 	HonorsSouteRouter honorsRoute.ApiRouter
-<<<<<<< HEAD
-	MyTest            mytest.TestApi
-=======
 	PostRouter        postseting.ApiRouter
 	DepartmentRouter  departmentseting.ApiRouter
->>>>>>> v1_dev
 }
 
 var RouterGroupEntry = new(RouterGroup)