use terminus font
fix merge conflicts