diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java
index 8ddfd364b5..1ac8b91494 100644
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -2005,7 +2005,6 @@ public interface Client extends GameShell
 	void setGeSearchResultIndex(int index);
 
 	/**
-<<<<<<< HEAD
 	 * Sets values related to jagex compliance
 	 */
 	void setComplianceValue(@Nonnull String key, boolean value);