fixed normals
fix merge conflict