Edit files
Edit README.md
Solve conflict