Fixed some bogus merge.