Adding push notifications to the app
fixing merge conflict