Fixing up some merging nonsense.