updated formulas to 0.973 and added a conflicts_with