x86_64: fix merge conflict

06992e159bJacob Young committed on 4/20/2023, 7:49:35 PM· committed by mluggparent9f1409c
1 file changedLine totals unavailable