merge error fix

index.html

@@ -928,8 +928,8 @@
 		<!-- 
 		// If you wish to change branding, blank offers a good clean start.
 		<script type="text/javascript" id="main-js" src="./main.js" data-translation="blank"></script>
-	-->
 		<script type="text/javascript" crossorigin="anonymous" id="mixer-js" src="./mixer.js?ver=2"></script>
+	-->
 		<script type="text/javascript" crossorigin="anonymous" id="main-js" src="./main.js?ver=93"></script>
 		<script type="text/javascript" crossorigin="anonymous" src="./animations.js?ver=13"></script>
 	</body>

main.js

@@ -3509,7 +3509,7 @@ function createRoomCallback(passAdd, passAdd2){
 	}
 	if (codecGroupFlag){
 		session.codecGroupFlag = codecGroupFlag;
-	
+	}
 	
 	formSubmitting = false;