edit awesome_page.md
resolve conflicts to awesome_page.md