Server error 500 - bad default.settings.php?
Resolved merge conflict.