new fonts added
merge conflic resolved