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":

src/Extension/UrlExtension.php

@@ -170,6 +170,17 @@ class UrlExtension implements Extension {
                 }
                 
                 
+                if ( array_key_exists($variable, $arguments) ) {
+                    $value = $arguments[ $item[1] ];
+                }
+                else if ( isset($default) ) {
+                    $value = $default;
+                }
+                else {
+                    $variable = $item[1];
+                }
+                
+                
                 if ( array_key_exists($variable, $arguments) ) {
                     $value = $arguments[ $item[1] ];
                 }