One last conflict I missed