merge bencode changes