working on colors
working with colors
fixing merge conflicts