Amended indentation in files.
Fix conflict