Finally solved conflict
changes to gitignore and notificationmanager