Adds alert
resolves conflict