jeez, didn't I verify the merge?