Fixed bug causing duplicate notifications.
Fixed conflicts.