revert bmfont
edit conflict