diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java b/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
index 47c60d6..2fb99f1 100644
--- a/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
+++ b/cloud-market2-server/src/main/java/com/muyu/market/server/config/AliPayConfig.java
@@ -15,11 +15,7 @@ import javax.annotation.PostConstruct;
 //读取yml文件中alipay 开头的配置
 @ConfigurationProperties(prefix = "alipay")
 public class AliPayConfig {
-<<<<<<< HEAD
 
-
-=======
->>>>>>> origin/master
     private String appId;
     private String appPrivateKey;
     private String alipayPublicKey;
diff --git a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
index 8e1e7ef..406b504 100644
--- a/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
+++ b/cloud-market2-server/src/main/java/com/muyu/market/server/controller/AliPayController.java
@@ -42,15 +42,12 @@ public class AliPayController {
         AlipayClient alipayClient = new DefaultAlipayClient(GATEWAY_URL, aliPayConfig.getAppId(),
                 aliPayConfig.getAppPrivateKey(), FORMAT, CHARSET, aliPayConfig.getAlipayPublicKey(), SIGN_TYPE);
         AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
-<<<<<<< HEAD
 
         request.setNotifyUrl(aliPayConfig.getNotifyUrl());
         request.setReturnUrl(aliPayConfig.getReturnUrl());
 
-=======
         request.setNotifyUrl(aliPayConfig.getNotifyUrl());
         request.setReturnUrl(aliPayConfig.getReturnUrl());
->>>>>>> origin/master
         request.setBizContent("{\"out_trade_no\":\"" + aliPay.getTraceNo() + "\","
                 + "\"total_amount\":\"" + aliPay.getTotalAmount() + "\","
                 + "\"subject\":\"" + aliPay.getSubject() + "\","