Updated - awesome_page.md made a conflict

There is a conflict?