added nginx.conf file
conflict