user-manual: more detailed merge discussion