diff --git a/src/site-constants.js b/src/site-constants.js
index 6e7c28ae0..d9cb28b3f 100644
--- a/src/site-constants.js
+++ b/src/site-constants.js
@@ -7,13 +7,8 @@
 
 // NOTE: We can't just use `location.toString()` because when we are rendering
 // the SSR part in node.js we won't have a proper location.
-<<<<<<< HEAD
 const urlRoot = 'https://ja.reactjs.org';
-const version = '16.8.4';
-=======
-const urlRoot = 'https://reactjs.org';
 const version = '16.8.6';
->>>>>>> 59c3c0a1551841cedfc8478524808492289e61f5
 const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js';
 
 export {babelURL, urlRoot, version};