Eric conflict resolve
Fixed conflict and added fonts