eliminating merge conflicts for copy.js and test.html