fixed a glitch in alarms caused by a merge conflict