Integrated doc-code-merge