fix broken merge business
Yeah