Small Conflict to awesome_page.md
Resolve conflict end