Egypt concludes fertilizer subsidy dispute