resolve merge conflict
handle jade templates (JS)
rad fuckin fish prompt