alert messages on actions
merge conflicts resolved