Fixed merge bugs
Fixed webfont bug