TESTING: fix up merge conflict that should have been resolved before commit