Trix merge version 2