merge Proto/repair-ff-coalesce

This merge removes the need for a separate Fulfillment model in the repair flow. This is done in order to simplify the understanding of the flow and have one API that we go through.