fix broken merge stuff