Fix post-rebase conflicts and change HAML to ERB
We don't need a database