Index: storage-tree/drivers/scsi/libsas/sas_ata.c
===================================================================
--- storage-tree.orig/drivers/scsi/libsas/sas_ata.c
+++ storage-tree/drivers/scsi/libsas/sas_ata.c
@@ -752,11 +752,7 @@ void sas_ata_strategy_handler(struct Scs
 
 		if (!dev_is_sata(ddev))
 			continue;
-<<<<<<<
 
-=======
-		
->>>>>>>
 		ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata port error handler");
 		ata_scsi_port_error_handler(shost, ap);
 	}
@@ -789,21 +785,13 @@ int sas_ata_eh(struct Scsi_Host *shost, 
 		LIST_HEAD(sata_q);
 
 		ap = NULL;
-<<<<<<<
 
-=======
-		
->>>>>>>
 		list_for_each_entry_safe(cmd, n, work_q, eh_entry) {
 			struct domain_device *ddev = cmd_to_domain_dev(cmd);
 
 			if (!dev_is_sata(ddev) || TO_SAS_TASK(cmd))
 				continue;
-<<<<<<<
 			if (ap && ap != ddev->sata_dev.ap)
-=======
-			if(ap && ap != ddev->sata_dev.ap)
->>>>>>>
 				continue;
 			ap = ddev->sata_dev.ap;
 			rtn = 1;
@@ -811,11 +799,7 @@ int sas_ata_eh(struct Scsi_Host *shost, 
 		}
 
 		if (!list_empty(&sata_q)) {
-<<<<<<<
 			ata_port_printk(ap, KERN_DEBUG, "sas eh calling libata cmd error handler\n");
-=======
-			ata_port_printk(ap, KERN_DEBUG,"sas eh calling libata cmd error handler\n");
->>>>>>>
 			ata_scsi_cmd_error_handler(shost, ap, &sata_q);
 		}
 	} while (ap);
Index: storage-tree/drivers/scsi/libsas/sas_scsi_host.c
===================================================================
--- storage-tree.orig/drivers/scsi/libsas/sas_scsi_host.c
+++ storage-tree/drivers/scsi/libsas/sas_scsi_host.c
@@ -681,20 +681,11 @@ enum blk_eh_timer_return sas_scsi_timed_
 {
 	struct sas_task *task = TO_SAS_TASK(cmd);
 	unsigned long flags;
-<<<<<<<
 	enum blk_eh_timer_return rtn;
 
 	if (sas_ata_timed_out(cmd, task, &rtn))
 		return rtn;
 
-=======
-	enum blk_eh_timer_return rtn; 
-
-	if (sas_ata_timed_out(cmd, task, &rtn))
-		return rtn;
-	
->>>>>>>
-
 	if (!task) {
 		cmd->request->timeout /= 2;
 		SAS_DPRINTK("command 0x%p, task 0x%p, gone: %s\n",