fixed indententation
merge conflicts