diff --git a/wpa_supplicant/binder/binder_constants.h b/wpa_supplicant/binder/binder_constants.h
index a4d9b55..725ae37 100644
--- a/wpa_supplicant/binder/binder_constants.h
+++ b/wpa_supplicant/binder/binder_constants.h
@@ -7,8 +7,13 @@
  * See README for more details.
  */
 
+<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
 #ifndef WPA_SUPPLICANT_BINDER_BINDER_CONSTANTS_H
 #define WPA_SUPPLICANT_BINDER_BINDER_CONSTANTS_H
+=======
+#ifndef BINDER_CONSTANTS_H
+#define BINDER_CONSTANTS_H
+>>>>>>> binder: Expose an aidl interface module
 
 namespace wpa_supplicant_binder {
 namespace binder_constants {
@@ -18,4 +23,8 @@
 } /* namespace binder_constants */
 } /* namespace wpa_supplicant_binder */
 
+<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
 #endif /* WPA_SUPPLICANT_BINDER_BINDER_CONSTANTS_H */
+=======
+#endif /* BINDER_CONSTANTS_H */
+>>>>>>> binder: Expose an aidl interface module
diff --git a/wpa_supplicant/binder/binder_manager.cpp b/wpa_supplicant/binder/binder_manager.cpp
index 27e8ded..80cfcd2 100644
--- a/wpa_supplicant/binder/binder_manager.cpp
+++ b/wpa_supplicant/binder/binder_manager.cpp
@@ -21,7 +21,11 @@
 
 BinderManager *BinderManager::instance_ = NULL;
 
+<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
 BinderManager *BinderManager::getInstance()
+=======
+BinderManager * BinderManager::getInstance()
+>>>>>>> binder: Expose an aidl interface module
 {
 	if (!instance_)
 		instance_ = new BinderManager();
diff --git a/wpa_supplicant/binder/binder_manager.h b/wpa_supplicant/binder/binder_manager.h
index d8b7dd0..872c13d 100644
--- a/wpa_supplicant/binder/binder_manager.h
+++ b/wpa_supplicant/binder/binder_manager.h
@@ -30,7 +30,11 @@
 class BinderManager
 {
 public:
+<<<<<<< 7cfb967dde32a14e227bee3b36eee1b36d1f8d0a
 	static BinderManager *getInstance();
+=======
+	static BinderManager * getInstance();
+>>>>>>> binder: Expose an aidl interface module
 	static void destroyInstance();
 	int registerBinderService(struct wpa_global *global);
 	int registerInterface(struct wpa_supplicant *wpa_s);