Fixed the server after disastrous git merge