prepare branch for merge conflict example
resolve merge conflict between master and small-conflict in awesome_page.md