diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index abf1a9fe..0263740d 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -171,23 +171,13 @@ class Crm::CustomersController < BaseCrmController
           nrc             = @customer.nrc_no
           card_no         = @customer.card_no
           paypar_account_no = @customer.paypar_account_no
-<<<<<<< HEAD
           id              = @customer.membership_id
           member_group_id = @customer.membership_type
-          # if !id.present? && !member_group_id.nil?
-=======
-          id              = @crm_customer.membership_id
-          member_group_id = @customer.membership_type
-          if !id.present? && !member_group_id.nil?
->>>>>>> d87ffee65b491cc164fa8b6aba6a385da646f18f
               membership      = MembershipSetting.find_by_membership_type("paypar_url")
               memberaction    = MembershipAction.find_by_membership_type("create_membership_customer")
               merchant_uid    = memberaction.merchant_account_id.to_s
               auth_token      = memberaction.auth_token.to_s
               url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
-
-<<<<<<< HEAD
-=======
               member_params = { name: name,phone: phone,email: email,
                                 dob: dob,address: address,nrc:nrc,card_no:card_no,
                                 member_group_id: member_group_id,
@@ -197,7 +187,6 @@ class Crm::CustomersController < BaseCrmController
               # Check for paypar account exists
               # if paypar_account_no != nil || paypar_account_no != ''
               if paypar_account_no.present?
->>>>>>> d87ffee65b491cc164fa8b6aba6a385da646f18f
                 member_params = { name: name,phone: phone,email: email,
                                   dob: dob,address: address,nrc:nrc,card_no:card_no,
                                   paypar_account_no: paypar_account_no,
@@ -257,7 +246,7 @@ class Crm::CustomersController < BaseCrmController
                 format.html { redirect_to crm_customers_path }
                 flash[:member_error] =response["message"]
               end
-          # end
+          end
         end
   end
     # POST /crm/customers