Fixed some identation problems
Fixed conflicts