Add potential conflict line