fixed indentation and blank lines
Fixed merging conflicts