Fixed conflicts added since latest commits

src/Extension/JsonExtension.php

@@ -15,14 +15,14 @@ class JsonExtension implements Extension {
             $this->register($context);
         }
     }
-
+        
     public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) 
     {
         $flag = $this->flags;
         
         switch ($token) {
             case "json.pretty":
-                $flag = \JSON_PRETTY_PRINT;
+                $flag |= \JSON_PRETTY_PRINT;
             break;
             
             case "json.html":