remove conflicts in quicktest