diff --git a/integration/pkg/api/search/nearbychargestation/request.go b/integration/pkg/api/search/nearbychargestation/request.go
index 926407070b1..90e2fdfcf92 100644
--- a/integration/pkg/api/search/nearbychargestation/request.go
+++ b/integration/pkg/api/search/nearbychargestation/request.go
@@ -26,10 +26,7 @@ type Request struct {
 	Limit        int
 }
 
-<<<<<<< HEAD
-=======
 // NewRequest create an empty entity Request.
->>>>>>> master-telenav
 func NewRequest() *Request {
 	return &Request{
 		// Path