Grunt process added to copy out versions of JS.
Merge conflict.