Remove merge argument from pillar.get

This argument is only currently available in develop, and thus does not
belong in this formula at this time.

nginx/ng/map.jinja

@@ -70,7 +70,7 @@
         },
         'managed': {},
     },
-}, merge=True) %}
+}) %}
 
 {% if 'user' not in nginx.server.config %}
 {% do nginx.server.config.update({