implementing merge: some small fixes in merge.rst