fixed a typo in the merge conflicts code block

changed "git merge derp" to "git merge newbranch"