add a change in awesome_page.md
a different change
resolve merge conflict
add changes to readme.md and awesomepage.md