feature coloring now really reflects selected topic
Fix conflicts