diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index c170d91..a5e277d 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -1,19 +1,11 @@
 ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
 
-<<<<<<< HEAD
-<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
-
-Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
-
-<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
-=======
 Once an order is raised, either using the Shopping Cart or from within
 ERPNext, your customer can view the order and keep an eye on the billing and
 shipment status. When the invoice and payment against these orders are
 submitted, the customer can see the updated status on the portal, at a glance.
 
 <img class="screenshot" alt="Customer Portal" src={{docs_base_url}}/assets/img/website/place-order.png)
->>>>>>> Edited help page
 
 #### Outstanding Sales Invoice