move conflicts to testing