Fixed up broken merge stuff.