Writing about `git merge`
Merge branch 'merge'

Added paragraph about merging.