resolve conflicts

src/main/java/io/github/redouane59/twitter/ITwitterClientV2.java

@@ -66,16 +66,7 @@ public interface ITwitterClientV2 {
    * @return a list of users who are following the targeted user
    */
   UserList getFollowers(String userId, AdditionalParameters additionalParameters);
-
-  /**
-   * Get a list of the user following limited to 1000 results calling https://api.twitter.com/2/users/:id/following
-   *
-   * @param userId the id of the targeted user
-   * @param additionalParameters accepted parameters are maxResults, pagination_token
-   * @return a list of users who are following the targeted user
-   */
-  UserList getFollowers(String userId, AdditionalParameters additionalParameters);
-
+
   /**
    * Get a list of the user following limited to 1000 results calling https://api.twitter.com/2/users/:id/following
    *
@@ -84,15 +75,6 @@ public interface ITwitterClientV2 {
    */
   UserList getFollowing(String userId);
 
-  /**
-   * Get a list of the user following limited to 1000 results calling https://api.twitter.com/2/users/:id/following
-   *
-   * @param additionalParameters accepted parameters are maxResults, pagination_token
-   * @param userId the id of the targeted user
-   * @return a list of users that the targeted user is following
-   */
-  UserList getFollowing(String userId);
-
   /**
    * Get a list of the user following limited to 1000 results calling https://api.twitter.com/2/users/:id/following
    *
@@ -341,7 +323,6 @@ public interface ITwitterClientV2 {
   TweetList getLikedTweets(String userId, AdditionalParameters additionalParameters);
 
 
-
   /**
    * The recent Tweet counts endpoint returns count of Tweets from the last seven days that match a search query calling
    * https://api.twitter.com/2/tweets/counts/recent