create page continued
conflict resolved