fixed indentations
conflicts fix