diff --git a/src/mrbesen/cr/auto/clicker/Main.java b/src/mrbesen/cr/auto/clicker/Main.java
index 8a77d6d..fdb7669 100644
--- a/src/mrbesen/cr/auto/clicker/Main.java
+++ b/src/mrbesen/cr/auto/clicker/Main.java
@@ -1,12 +1,9 @@
 package mrbesen.cr.auto.clicker;
 
-<<<<<<< HEAD
 import javax.swing.*;
-=======
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsDevice.WindowTranslucency;
 import java.awt.GraphicsEnvironment;
->>>>>>> refs/heads/dev
 
 public class Main {