Fixed further indentation issues.
Adding merged files.