Handle @username message style
Merge