updated formulas to 0.973 and added a conflicts_with
Merge pull request #5 from kashif/updated

updated formulas to 0.973 and added a conflicts_with