Fix merge conflict in pusher js
Start styling message text