acpuclock-8064: Fix conflicts