setup: fix errant conflict debris