Modifying raven.md in master branch for creating a conflict
modified raven.md in the conflict branch
Merge conflict