Indenting fixed. NO MORE SAME-LINE }s
Merge conflict fixed