Chat UI
Merge Conflict
Chat Font
Merge Conflict