fixing indentation
merge