corrected few indentation errors while merging