diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
index cf3d146171fad1519e0ae2fde8520c90acbc67bb..34630aa569ddd5472213598889229df543c9ccdd 100755
--- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
+++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties
@@ -327,8 +327,5 @@ lockSettingsLockOnJoin=true
 lockSettingsLockOnJoinConfigurable=false
 
 allowDuplicateExtUserid=true
-<<<<<<< HEAD
 
 defaultTextTrackUrl=${bigbluebutton.web.serverURL}/bigbluebutton
-=======
->>>>>>> 40d87e801950a9c22332dff0500564f930059238
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/RecordingController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/RecordingController.groovy
index 8d85de9469b0eff7a67d136790781876485ec1d7..88ba14f09ad6967a95c14eef332267be00cfb907 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/RecordingController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/RecordingController.groovy
@@ -87,14 +87,7 @@ class RecordingController {
       return
     }
     // END - backward compatibility
-
-    // Do we agree on the checksum? If not, complain.
-    if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
-      errors.checksumError()
-      respondWithErrors(errors)
-      return
-    }
-
+    
     String recId = StringUtils.strip(params.recordID)
     String result = meetingService.getRecordingTextTracks(recId)