Added the line this might cause merge conflict
"merging"
Merge branch 'master' of https://github.com/nnistler/methods-repos