diff --git a/Startcode/main.c b/Startcode/main.c
index 3e71d5f..0d72078 100644
--- a/Startcode/main.c
+++ b/Startcode/main.c
@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include "input.h"
 #include "game.h"
 #include "graphicalGame.h"
@@ -7,8 +8,7 @@
 #define MAX_NUMBER_OF_WORDS 100
 #define SALAD_SIZE 36
 
-<<<<<<< HEAD
-=======
+
 int checkSalad(char words[][MAX_WORD_LEN], char wordSalad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], int placedWords, int wordCount){
     //Iteriere über alle verfügbaren Wörter
     int foundWords = 0;
@@ -45,7 +45,6 @@ int checkSalad(char words[][MAX_WORD_LEN], char wordSalad[MAX_SEARCH_FIELD_LEN][
     return -1;
 }
 
->>>>>>> 61221a5b8ddad53683e9cad057577a9e8b9ea958
 int main(int argc, char *argv[])
 {
     int exitCode = EXIT_SUCCESS;