fix merge conflicts

diff --cc tweepy/api.py
index 2aaae089ec92edbc21ccf9abd04ff8de938bce2a,423c23feec20d6aec8a1f36c4db92b212038d36c..45fdd1ef908f4771c96e35f5cc0c4b1f7f163948
--- 1/tweepy/api.py
--- 2/tweepy/api.py
+++ b/tweepy/api.py
@@@ -164,9 -164,10 +164,9 @@@ class API(object)
              allowed_param=['id']
          )
  
 -
      @property
      def update_status(self):
-         """ :reference: https://dev.twitter.com/docs/api/1.1/post/statuses/update
+         """ :reference: https://dev.twitter.com/rest/reference/post/statuses/update
              :allowed_param:'status', 'in_reply_to_status_id', 'lat', 'long', 'source', 'place_id', 'display_coordinates'
          """
          return bind_api(
@@@ -960,9 -962,8 +970,10 @@@
  
      @property
      def _add_list_members(self):
 -        """ :reference: https://dev.twitter.com/rest/reference/post/lists/members/create_all
 -            :allowed_param:'screen_name', 'user_id', 'slug', 'lit_id', 'owner_id', 'owner_screen_name'
 +        """ :reference: https://dev.twitter.com/docs/api/1.1/post/lists/members/create_all
 +            :allowed_param:'screen_name', 'user_id', 'slug', 'lit_id',
 +            'owner_id', 'owner_screen_name'
++
          """
          return bind_api(
              api=self,
@@@ -984,9 -985,8 +995,10 @@@
  
      @property
      def _remove_list_members(self):
 -        """ :reference: https://dev.twitter.com/rest/reference/post/lists/members/destroy_all
 -            :allowed_param:'screen_name', 'user_id', 'slug', 'lit_id', 'owner_id', 'owner_screen_name'
 +        """ :reference: https://dev.twitter.com/docs/api/1.1/post/lists/members/destroy_all
 +            :allowed_param:'screen_name', 'user_id', 'slug', 'lit_id',
 +            'owner_id', 'owner_screen_name'
++
          """
          return bind_api(
              api=self,
@@@ -1187,9 -1169,8 +1199,10 @@@
  
      @property
      def geo_search(self):
 -        """ :reference: https://dev.twitter.com/rest/reference/get/geo/search
 -            :allowed_param:'lat', 'long', 'query', 'ip', 'granularity', 'accuracy', 'max_results', 'contained_within'
 +        """ :reference: https://dev.twitter.com/docs/api/1.1/get/geo/search
 +            :allowed_param:'lat', 'long', 'query', 'ip', 'granularity',
 +             'accuracy', 'max_results', 'contained_within
++
          """
          return bind_api(
              api=self,