update merge fix