now alerts function like normal
merge