Fix bad merge

+ Indentation fixes