mlx5: Fix merge errors.