Add a new merge option for jive.js file to stop this obnoxious stuff.
Merge commit '4d51a43'