Update awesome_page.md from small-conflict branch
Update awesome_page.md on master branch
Test
Test
Test
Resolve conflict
Delete awesome_page.md