Fix some bad merging.