misc
conflict
removed unnecessary (and harmful) calls to Encode::decode