chore: Remove merge leftovers (#164)

* fix Java 21 compat

* fmt

* chore: Remove merge leftovers

* fix more

Author: khvn26

src/main/java/com/flagsmith/FlagsmithClient.java

@@ -81,11 +81,8 @@ public void updateEnvironment() {
 
   /**
    * Get all the default for flags for the current environment.
-   * <<<<<<< HEAD
-   * =======
    *
    * @return environment flags
-   *         >>>>>>> a7a9291 (feat: Support transient identities and traits)
    */
   public Flags getEnvironmentFlags() throws FlagsmithClientError {
     if (getShouldUseEnvironmentDocument()) {
@@ -99,10 +96,7 @@ public Flags getEnvironmentFlags() throws FlagsmithClientError {
    * Get all the flags for the current environment for a given identity.
    *
    * @param identifier identifier string
-   *                   <<<<<<< HEAD
-   *                   =======
    * @return result of flag evaluation for given identity
-   *         >>>>>>> a7a9291 (feat: Support transient identities and traits)
    */
   public Flags getIdentityFlags(String identifier)
       throws FlagsmithClientError {