Fix merging issues on alarm alert fragment and alarm service