deleted method "checkAlert"
Merge branch 'branch1'
deleted