diff --git a/include/functions.php b/include/functions.php
index 2e46388..6d235ba 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3,9 +3,18 @@
 function getMMDVMHostVersion() {
 	// returns creation-time of MMDVMHost as version-number
 	$filename = MMDVMHOSTPATH . "MMDVMHost";
+<<<<<<< HEAD
 	exec($filename . " 2>&1", $output);
 	$version = substr($output[1], 10, 4)."-".substr($output[1], 14, 2)."-".substr($output[1], 16, 2)." (compiled ".getMMDVMHostFileVersion().")";
 	return $version;
+=======
+	exec($filename." -v 2>&1", $output);
+	if (substr($output[0],18,8) == ".ini fil") {
+		return getMMDVMHostFileVersion();
+	} else {
+		return substr($output[0],18,8)." (compiled ".getMMDVMHostFileVersion().")";
+	}
+>>>>>>> d49dbc67902a058b9de8b74c08002ee49f6366c7
 }
 
 function getMMDVMHostFileVersion() {
@@ -401,4 +410,4 @@ function getActualReflector($logLines, $mode) {
 $mmdvmconfigs = getMMDVMConfig();
 $logLines = getLog();
 $lastHeard = getLastHeard($logLines);
-?>
\ No newline at end of file
+?>
diff --git a/index.php b/index.php
index e26789f..30273fa 100644
--- a/index.php
+++ b/index.php
@@ -33,7 +33,11 @@ include "include/functions.php";
   	echo "Hotspot";
   }
   ?>:</small>  <?php echo getCallsign($mmdvmconfigs) ?></h1>
+<<<<<<< HEAD
   <h4>MMDVMHost by G4KLX - Version: <?php echo getMMDVMHostVersion() ?></h4>
+=======
+  <h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
+>>>>>>> d49dbc67902a058b9de8b74c08002ee49f6366c7
 </div>
 <?php
 // Here you can feel free to disable info-sections by commenting out with // before include