diff --git a/cheatsheet.txt b/cheatsheet.txt
index 20f35b4..5db9ed9 100644
--- a/cheatsheet.txt
+++ b/cheatsheet.txt
@@ -8,4 +8,6 @@ git status # Just to see
 ssh-keygen -t rsa -b 4096 -C "youremail@example.com"
 tail <path to id_rsa.pub> # Add this key to your GitHub account
 git remote add orign <ssh url.git>
-git push origin master
\ No newline at end of file
+git push origin master
+git log 
+git conflict