Pull alarms in to master

then trash master