Minified without merge errors that were present in previous version.