indent and merge fix