Remove remnants from conflict resolution (#3528)

Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
2a68a6171aJoseph T. Lyons committed on 12/7/2023, 4:44:49 AM· committed by GitHubparent27e1787
3 files changedLine totals unavailable