fix broken merge business