sparc64: merge fix