diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index aa9e80aaacf..3dbf03c15e8 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -55,9 +55,27 @@
 				<div class="cell"></div>
 				<div class="cell"></div>
 			</div>
+<<<<<<< 889e91312e9cfe10a2fd38ba7864e7c7546f4de8
 			<div class="app-listing item-list image-view-container three-column">
 				
 			</div>
 		</div>
 	</div>
+=======
+			<span id="customer-results" style="color:#68a;"></span>
+            <div class="row pos-item-toolbar">
+				<div class="search-item-group col-xs-5"></div>
+				<div class="search-item col-xs-7"></div>
+            </div>
+    		<div class="item-list-area" style="auto">
+				<div class="app-listing item-list"></ul>
+    		</div>
+    	</div>
+		<div class="row">
+			<div class="text-right list-paging-area">
+				<button class="btn btn-default btn-more btn-sm" style="margin:5px 20px">{{ __("More") }}</button>
+			</div>
+		</div>
+    </div>
+>>>>>>> offline email for POS
 </div>
diff --git a/erpnext/public/js/pos/pos_selected_item.html b/erpnext/public/js/pos/pos_selected_item.html
index c73daa0c8ae..501e1da0666 100644
--- a/erpnext/public/js/pos/pos_selected_item.html
+++ b/erpnext/public/js/pos/pos_selected_item.html
@@ -1,4 +1,3 @@
-<<<<<<< d8a807e5853af7f9d633b32c2aff0c80ebca7d3d
 <div class="pos-selected-item-action" data-item-code="{%= item_code %}">
 	<div class="pos-list-row">
 		<span class="cell bold">{{item_name}}</span>
@@ -18,32 +17,5 @@
 	<div class="pos-list-row">
 		<div class="cell">Amount:</div>
 		<div class="cell pos-item-disc">{%= amount %}</div>
-=======
-<h5 style="margin-top:5px">Item <span class="text-primary no-margin font-montserrat">{%= item_name %}</h5>
-<div class="pos-bill-item" data-item-code="{%= item_code %}">
-	<div class="form-group edit-pos-item">
-		<label class=" text-left col-xs-4">Price:</label>
-		<div class="col-xs-8">
-			<input class="form-control text-right pos-item-price" disabled value="{%= rate %}">
-		</div>
-	</div>
-	<div class="form-group edit-pos-item">
-		<label class=" text-left col-xs-4">Qty:</label>
-		<div class="col-xs-8">
-			<input class="form-control text-right pos-item-qty" disabled value="{%= qty %}">
-		</div>
-	</div>
-	<div class="form-group edit-pos-item">
-		<label class=" text-left col-xs-4">Discount:</label>
-		<div class="col-xs-8">
-			<input class="form-control text-right pos-item-disc" disabled value="{%= discount_percentage %}">
-		</div>
-	</div>
-	<div class="form-group edit-pos-item">
-		<label class=" text-left col-xs-4">Amount:</label>
-		<div class="col-xs-8">
-			<input class="form-control text-right " disabled value="{%= amount %}">
-		</div>
->>>>>>> added event on numeric keypad
 	</div>
 </div>
\ No newline at end of file