fix colorcoding of conflicts