test_fancysets: resolved merge conflict