fix conflict in 3c2ce1685891efe5e3d697904b9c56452825f37c
add a comment with hints on how to fix breakage
fix broken biegin/end tangents