Comment by gmaslov

FYI, you've got a merge conflict marker hanging out in your privacy policy :)

<<<<<<< HEAD:web/src/main/resources/com/pacifica/web/views/privacy.ftl We use this information solely [...]