diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php
index b3881b31e..ad433cec8 100644
--- a/libraries/tcpdf/tcpdf.php
+++ b/libraries/tcpdf/tcpdf.php
@@ -2996,11 +2996,18 @@ if(!class_exists('TCPDF', false)) {
 				}
 				case 'D': {
 					//Download file
+<<<<<<< HEAD
 					if(ob_get_contents()) {
 						$this->Error(ob_get_contents().'Some data has already been output, can\'t send PDF file');
 					}
 					//ob_end_clean();
 					//ob_start();
+=======
+				//	if(ob_get_contents()) {
+					//	$this->Error(ob_get_contents().'Some data has already been output, can\'t send PDF file');
+					//}
+				
+>>>>>>> 14b26e3... TCPDF Class: Clean output buffer before downloading file
 					if(isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'],'MSIE')) {
 						header('Content-Type: application/force-download');
 					} else {