diff --git a/pom.xml b/pom.xml
index 356d4581..94369caf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -269,6 +269,9 @@
                 </goals>
               </execution>
             </executions>
+            <configuration>
+              <source>8</source>
+            </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/com/flagsmith/FlagsmithClient.java b/src/main/java/com/flagsmith/FlagsmithClient.java
index d9c733a4..046a9c48 100644
--- a/src/main/java/com/flagsmith/FlagsmithClient.java
+++ b/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,8 @@ 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 {