adds pages to cardstack, fixes merge conflicts

merging