fix merge conflicts

src/Bundle/ChillMainBundle/Entity/Address.php

@@ -142,7 +142,7 @@ class Address
      * @ORM\ManyToOne(targetEntity="Chill\MainBundle\Entity\PostalCode")
      * @Groups({"write"})
      */
-    private ?PostalCode $postcode;
+    private ?PostalCode $postcode = null;
 
     /**
      * @var string|null
@@ -304,10 +304,8 @@ class Address
 
     /**
      * Get postcode.
-     *
-     * @return PostalCode
      */
-    public function getPostcode()
+    public function getPostcode(): ?PostalCode
     {
         return $this->postcode;
     }