Amend before merge for mff