diff --git a/LiquipediaMenu/API/LiquipediaMatchesAPI.swift b/LiquipediaMenu/API/LiquipediaMatchesAPI.swift
index f385298..3202e87 100644
--- a/LiquipediaMenu/API/LiquipediaMatchesAPI.swift
+++ b/LiquipediaMenu/API/LiquipediaMatchesAPI.swift
@@ -2,7 +2,7 @@
 //  LiquipediaMatchesAPI.swift
 //  LiquipediaMenu
 //
-//This class scrapes the Liquipedia upcoming matches page. It extracts them and puts them into a [Match]? by, using the Match class as a data storage objet. 
+//This class scrapes the Liquipedia upcoming matches page. It extracts them and puts them into a [Match]? by, using the Match class as a data storage objet.
 //  Created by Felix Förtsch on 08.10.18.
 //  Copyright © 2018 Felix Förtsch. All rights reserved.
 //
diff --git a/LiquipediaMenu/StatusBarController.swift b/LiquipediaMenu/StatusBarController.swift
index c2d373c..558ee85 100644
--- a/LiquipediaMenu/StatusBarController.swift
+++ b/LiquipediaMenu/StatusBarController.swift
@@ -56,11 +56,8 @@ class StatusBarController: NSObject, NSMenuItemValidation {
                 }
             }
             
-<<<<<<< HEAD
-            if let matches = self.matchesAPI.fetchMatches(for: "counterstrike") {
-=======
-            if let matches = self.matchesAPI.fetchMatches(for: "starcraft2") {
->>>>>>> 7de8fd2c2bd41baf8480580a6392c8c7869919a6
+
+            if let matches = self.matchesAPI.fetchMatches(for: "dota2") {
                 for match in matches {
                     let newItem = MatchMenuItem.init(for: match, action: #selector(self.openStreamLink))
                     newItem.tag = 1