develop function add
rebase conflict
alert add (feature)