Fixed conflicts added since latest commits

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] ];
                 }