bubble font added
user model
fix merge