That's my bad.  Erase those merge traces before completing this PR.