mergefix followup