conflicting commit from ACME