basic alarm 4

fixing conflict