"Changes made to the merge_script.js for the cell diffing ui" + some fixes

Re-rolling #90 to include some fixes that make it work with #91 .