Undid mockup of mergefix