push notifications
deleted extra file
fixed merge issues