Fix problematic strings introduced in previous conflicts fixing