Add simple_alarm, fix merge