fix python folding
fix merge