world merge fix