vecmath
fix merge