Color Scheme
resolving merge conflict