git merge conflict
Merge branch 'master' of https://github.com/rbarman/Brainy-Quote-App