minor merge fix