GCM to dynamically update various conditions in the chat activity
Resolve merge conflict