Small change to awesome_page.md for merge conflict later
Different change to create merge conflict in awesome_page.md
Resolve merge conflict on awesome_page.md