fixing indentations
merge