updated files for individual alarms
resolved conflicts