fix merge conflicts
Merge pull request #2 from hughrawlinson/dynamicCalibration

fix merge conflicts