fixed conflicts
fixed conflicts
added font