removed silly print statements from unified.html, and similarly trivial changes
fixed merge conflicts