Merge conflict
Added support for push messages