diff --git a/selling/utils.py b/selling/utils.py
index 1c0ed8424c..144eccc587 100644
--- a/selling/utils.py
+++ b/selling/utils.py
@@ -69,18 +69,13 @@ def get_item_details(args):
 	
 	if cint(args.is_pos):
 		pos_settings = get_pos_settings(args.company)
-<<<<<<< HEAD
-		out.update(apply_pos_settings(pos_settings, out))
+		if pos_settings:
+			out.update(apply_pos_settings(pos_settings, out))
 		
 	if args.doctype in ("Sales Invoice", "Delivery Note"):
 		if item_bean.doc.has_serial_no and not args.serial_no:
 			out.serial_no = _get_serial_nos_by_fifo(args, item_bean)
 		
-=======
-		if pos_settings:
-			out.update(apply_pos_settings(pos_settings, out))
-
->>>>>>> 3d1ecf5254c5887a48c04003c7dce8a218136ddd
 	return out
 
 def _get_serial_nos_by_fifo(args, item_bean):