added pure zigzag
zigzag
fixed conflicts