Added nginx and default confs
Fixed conflicts