diff --git a/nginx/ng/map.jinja b/nginx/ng/map.jinja
index ea0ddc5..62f9700 100644
--- a/nginx/ng/map.jinja
+++ b/nginx/ng/map.jinja
@@ -24,7 +24,10 @@
             'vhost_available': '/etc/nginx/conf.d',
             'vhost_enabled': '/etc/nginx/conf.d',
             'vhost_use_symlink': False,
+<<<<<<< HEAD
             'pid_file': '/var/run/nginx.pid',
+=======
+>>>>>>>  * added pillar variable to specify os release version for nginx package repo base url for RedHat family os hosts
             'rh_os_releasever': '$releasever',
         },
         'Suse': {