Updated - awesome_page.md made a conflict
Updated - awesome_page.md conflict fixed