Fix conflicts_with texts