diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index dc21b3f8488..b2657e1d7f9 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -3004,6 +3004,11 @@
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "timeline_field": "supplier", 
+<<<<<<< f2ba6af60b37b968f1aff340a88765a917c3f133
  "title_field": "title", 
  "track_seen": 0
-}
\ No newline at end of file
+}
+=======
+ "title_field": "title"
+}
+>>>>>>> Added posting_time in purchase invoice