Recompile from merge conflict of minified JS