Removed the notification until it can be fixed
Fixed merge