...
fixed conflict
 vet ej