Log conflicts separately