fixed merge stuff, alerts