indentation errors after merge