Fixing Toussaints Merges