more futzing with iframe
fixed merge issue