diff --git a/changelog-beta.md b/changelog-beta.md
index 07a137b..60b024c 100644
--- a/changelog-beta.md
+++ b/changelog-beta.md
@@ -1,10 +1,12 @@
-<<<<<<< HEAD
+#### 2.0.1.0010-beta
+```diff
++ Set timestamp to <episode-num system="original-air-date">
+```
+
 #### 2.0.0.0008-beta
 ##### Fixes
 - Pull request #6 [Error in http/https detection] window.location.protocol return "https:", not "https://"
 
-=======
->>>>>>> beta
 #### 2.0.0.0007-beta
 ```diff
 + Buffer HLS: Add VOD tag from M3U8
diff --git a/src/webserver.go b/src/webserver.go
index c83d5eb..cb615cc 100644
--- a/src/webserver.go
+++ b/src/webserver.go
@@ -599,7 +599,7 @@ func Web(w http.ResponseWriter, r *http.Request) {
 
 		if System.ScanInProgress == 0 {
 
-			if len(Settings.Files.M3U) == 0 || len(Settings.Files.HDHR) == 0 {
+			if len(Settings.Files.M3U) == 0 && len(Settings.Files.HDHR) == 0 {
 				System.ConfigurationWizard = true
 			}
 
diff --git a/xteve.go b/xteve.go
index 07bff7f..7da9a4b 100644
--- a/xteve.go
+++ b/xteve.go
@@ -39,7 +39,7 @@ var GitHub = GitHubStruct{Branch: "master", User: "xteve-project", Repo: "xTeVe-
 const Name = "xTeVe"
 
 // Version : Version, die Build Nummer wird in der main func geparst.
-const Version = "2.0.0.0008"
+const Version = "2.0.1.0010"
 
 // DBVersion : Datanbank Version
 const DBVersion = "2.0.0"