Update to include inflation adjust
merge resolution