We are using the same branch for both the decoder and encoder. As far as merging go, I don't think that's going to be a problem quite yet. The decoder still have to be tested by @alisan16 and @mgentili once I get it to build correctly.