diff --git a/.backup/crontab-20201112-070100.gz b/.backup/crontab-20201112-070100.gz
new file mode 100644
index 0000000..dc7c41a
Binary files /dev/null and b/.backup/crontab-20201112-070100.gz differ
diff --git a/.zsh_history b/.zsh_history
index 0ef3d55..fe18415 100644
--- a/.zsh_history
+++ b/.zsh_history
@@ -9030,6 +9030,7 @@ done
 : 1605085910:0;cat ~/.zshrc| grep proxy
 : 1605085916:0;unproxy
 : 1605085919:0;php artisan ins:like
+<<<<<<< HEAD
 : 1605232199:0;ssh jump
 : 1605233443:0;gst
 : 1605233444:0;gl
@@ -10611,3 +10612,6 @@ done
 : 1607067566:0;gst
 : 1607067569:0;gl
 : 1607067658:0;sudo su
+=======
+: 1605144649:0;ssh jump
+>>>>>>> 020c40694824f42a7c423d805a26fb2a240d56e0