Notifications, hover_show, resources
conflict resolved