modified css coloring
resolving merge conflict