head merge fix