Fixes 3.3.8 merge function with new CM 4.6.  Now uses uses strict.