add nginx
merge