fixed merger issue

Didn't realize Dave had updated this. That's what I get for not syncing git!