real merge fix