resolve git stash pop conflict

README.md

@@ -1,13 +1,19 @@
 # stater
 It's a Test to learn how to use git .
-<<<<<<< HEAD
 Let me try to make some changed.
 
 test git fetch. Now, I'm going to merge it.
 =======
 let me try to use git fetch.
 this is a test to test fetch.
 
+<<<<<<< Updated upstream
+
 <<<<<<< HEAD
 =======
 Make some changes on remote repo. conflict before the git stash .
+=======
+Do some changes before git stash.
+
+fix the conflict between git stash version and remote version.
+