Add conflict to awesome page
Merge pull request #2 from downeyd27/small-conflict

Add conflict to awesome page
Merge conflict