fix python indents and such
fix conflict