Fix leftover merge artifacts
Fix merge errors
Remove merge artifacts
Default parameter needs to come before ssl

Older versions of nginx need the parameters to be in this order