merge armor.js and patchwork.js