add chamfer
merged chamfer
fix merge issues