diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java b/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
index 3f233e45..31106d19 100644
--- a/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
+++ b/hai-cweb/src/main/java/com/cweb/controller/HighUserCardController.java
@@ -53,15 +53,12 @@ public class HighUserCardController {
     @Resource
     private HighUserService highUserService;
 
-<<<<<<< HEAD
-=======
     @Resource
     private HighUserPayPasswordService highUserPayPasswordService;
 
     @Resource
     private HighFleetOilCardService fleetOilCardService;
 
->>>>>>> activit
     @RequestMapping(value = "/bindCard", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "绑卡")