push notifications extravaganza (checked, working)
conflict fixed