Fixing merge conflict in BitmapFontAtlas.