Added a small conflict to awesome-feature
added a small conflict to the master branch
fixed the merge conflict