alert bars
merge conflict