test new conflict