reindent using spaces
merge