add otf font
fix merge conflics