remove Bitset usage
merge