diff --git a/src/main/scala/lc/background/taskThread.scala b/src/main/scala/lc/background/taskThread.scala
index a00a4d5..6e9dbd8 100644
--- a/src/main/scala/lc/background/taskThread.scala
+++ b/src/main/scala/lc/background/taskThread.scala
@@ -35,15 +35,11 @@ class BackgroundTask(throttle: Int, timeLimit: Int) {
     val media = pickRandom(captcha.allowedMedia)
     val inputType = pickRandom(captcha.allowedInputType)
 
-<<<<<<< HEAD
     Parameters(level, media, inputType, Some(Size(0, 0)))
   }
 
   private def pickRandom[T](list: List[T]): T = {
     list(Config.getNextRandomInt(list.size))
-=======
-    Parameters(level, media, inputType, Some(Size(0,0)))
->>>>>>> 8f0f29c579087846784922959337e2a25c11b617
   }
 
   def beginThread(delay: Int): Unit = {