Update awesome_page.md in master
Fixed merge conflict