Add small change for merge conflict
Add different change to awesome_page.md for merge conflict
Resolve conflict on branch