changed dashboard colors
updated conflict