fixed merge bugs(added font)