Adds alert
resolves conflict
One more alert