diff --git a/FreeBSD/storage/zfs-dataset-backup.bash b/FreeBSD/storage/zfs-dataset-backup.bash
index 0099704..db7c752 100644
--- a/FreeBSD/storage/zfs-dataset-backup.bash
+++ b/FreeBSD/storage/zfs-dataset-backup.bash
@@ -26,10 +26,6 @@ openssl enc -aes-256-ctr -a -pbkdf2 -iter 1000 -salt -k $enc_password \
 > $backup_location/$dataset_name-$backup_date.pigz.enc
 
 ## delete snapshot
-<<<<<<< HEAD
-#sleep 1
-=======
->>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
 zfs destroy $dataset_orig@$backup_date
 
 # report done