ACPI: fix git automerge failure