Fix rebase

Author: VincentLanglet

src/Type/ObjectShapeType.php

@@ -301,17 +301,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 			}
 
 			$result = $result->and($hasProperty);
-<<<<<<< HEAD
-			$otherProperty = $type->getProperty($propertyName, $scope);
-=======
-
-			try {
-				$otherProperty = $type->getInstanceProperty($propertyName, $scope);
-			} catch (MissingPropertyFromReflectionException) {
-				return $result;
-			}
-
->>>>>>> a507ab857 (Solve deprecations)
+			$otherProperty = $type->getInstanceProperty($propertyName, $scope);
 			if (!$otherProperty->isPublic()) {
 				return IsSuperTypeOfResult::createNo();
 			}