Prototype new version

new merge & diff prototypes version!