Added highlighting of conflicts feature