diff --git a/base/mutex.h b/base/mutex.h
index 08a46db10d..d59cf45000 100644
--- a/base/mutex.h
+++ b/base/mutex.h
@@ -43,11 +43,18 @@ struct atomic_flag_init {
 static const atomic_flag_init NATIVE_ATOMIC_FLAG_INIT;
 
 class atomic_flag {
+<<<<<<< HEAD
 public:
 	atomic_flag() {
 	}
 	
 	atomic_flag(const atomic_flag_init &v) : value(0) {
+=======
+	atomic_flag() {
+	}
+
+	atomic_flag(atomic_flag_init &v) : value(0) {
+>>>>>>> upstream/master
 	}
 
 	void clear() {