messed around with colors
merge conflict resolved