vel
conflicts omitted