Conflict issue fix
nnn
Merge branch 'master' of https://github.com/andrewdex/dalert.git