Revert "Fix CONFLICTS function"