diff --git a/The basics of Git.md b/The basics of Git.md
index 6b3cc03..7130d09 100644
--- a/The basics of Git.md	
+++ b/The basics of Git.md	
@@ -49,4 +49,5 @@
 `git pull -r`
 - Fetch remote changes and apply them locally
 `git stash pop`
- - Take uncommitted changes, and apply them 
\ No newline at end of file
+ - Take uncommitted changes, and apply them over the changes just added, using merge conflict markers.
+Then open the project in any merge conflict resolver, and manually resolve the commit. Most IDEs have one of some form
\ No newline at end of file