diff --git a/nginx.conf b/nginx.conf.conflict
similarity index 100%
rename from nginx.conf
rename to nginx.conf.conflict