fix conflicts

diff --cc include/wifi-aware.h
Simple merge

diff --cc src/include/wifi-aware-gdbus.h
Simple merge

diff --cc src/include/wifi-aware-private.h
index 5d05915,0e8e8ee..da4c714
--- 1/src/include/wifi-aware-private.h
--- 2/src/include/wifi-aware-private.h
+++ b/src/include/wifi-aware-private.h
@@@ -32,6 -31,13 +31,15 @@@ extern "C" 
  #define WIFI_AWARE_HANDLE_LOCK
  #define WIFI_AWARE_HANDLE_UNLOCK
  
+ typedef struct {
+       int client_id;
+       wifi_aware_enabled_cb enabled_cb;
+       void *enabled_cb_data;
++      wifi_aware_disabled_cb disabled_cb;
++      void *disabled_cb_data;
+       GHashTable *peer_map;
+ } wifi_aware_s;
+ 
  const char *_wifi_aware_convert_error_type_to_string(wifi_aware_error_e err);
  
  int _wifi_aware_handle_create(wifi_aware_h *wifi_aware);

diff --cc src/wifi-aware-gdbus.c
Simple merge

diff --cc src/wifi-aware-private.c
Simple merge

diff --cc src/wifi-aware.c
Simple merge

diff --cc test/wifi-aware-test.c
Simple merge