on arrival deletes alert and marks old
Merge remote-tracking branch 'origin/master'