fix the conflict from working branch
fix conflict from working branch againgit statusgit status
update the conflict
Add README