diff --git a/src/parser.c b/src/parser.c
index 67665b8..c200b3d 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -4,12 +4,8 @@ const List* TokensList;
 int CurrentToken = 0;
 
 void PrintSymbols(void);
-<<<<<<< Updated upstream
-void HandleOperation(void);
-=======
 SymbolString* ParseIdentifierParameter(void);
 Instruction* HandleOperation(void);
->>>>>>> Stashed changes
 void HandleAssemblerDirective(void);
 void AdvanceParser(void);
 void IgnoreParserLine(void);
@@ -36,11 +32,6 @@ IRState* ParseTokens(List* tokens) {
                 HandleOperation();
                 break;
             case LabelClass:
-<<<<<<< Updated upstream
-                AdvanceParser();
-                AddSymbolToTable(t->Lemexe, NULL, strlen(t->Lemexe), MachineState.SymbolsTable)->Resolved = 1;
-                AdvanceParser(); //Consume the NewLine
-=======
                 {
                     Symbol* symbol = TryGetSymbol(t->Lemexe, MachineState.SymbolsTable);
 
@@ -63,7 +54,6 @@ IRState* ParseTokens(List* tokens) {
                     // symbol->Value.Instruction = ins;
                     // symbol->InstructionPointer = 1;
                 }
->>>>>>> Stashed changes
                 break;
             default:
                 fprintf(stderr, "[Warning] Line %d: Syntax error, expected start of expression, got '%c' [%d].\n", t->LineNumber, t->Value.Punctuation, t->Class);
@@ -140,10 +130,6 @@ Parameter* GetParameterType() {
             AdvanceParser();
 
             return param;
-<<<<<<< Updated upstream
-        case LabelClass:
-=======
->>>>>>> Stashed changes
         case IdentifierClass:
             param->ParameterType = AddressParameter;
             param->InterpretedAs = AddressParameter;