added cheap normals
fixed merge