fix merge errors and indentation