diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index ef247a3546c23..0b5d00d2d801f 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -202,7 +202,11 @@
 
 	print '<table class="border centpercent tableforfield">';
 	// Linked documents
+<<<<<<< HEAD
 	if ($origin == 'order_supplier' && $object->origin_object->id && isModEnabled("supplier_order")) {
+=======
+	if ($origin == 'order_supplier' && is_string($typeobject) && $typeobject != '' && $object->$typeobject->id && isModEnabled("supplier_order")) {
+>>>>>>> b56fd32716c (Extra test to fix PhanTypeInvalidPropertyName)
 		print '<tr><td class="titlefield">';
 		$objectsrc = new CommandeFournisseur($db);
 		$objectsrc->fetch($object->origin_object->id);