How F1 solved its engine controversy before new season after Mercedes loophole

A compromise solution has been reached by the FIA to try and close a loophole in the new engine regulations