Cleaning up a dirty merge.