Fixed half-done merge.