fix alert bug, change db
merge