alert basic functionality added
merge