CONFLICTS is a keyword regression test fix