auto merge fix