Em Software's InDesign plug-in for merging changes in placed files adds conflict markers (displayed as InDesign Notes), better handling of quote characters, hyphens, and non-breaking spaces, improved character style-level conflict handling, and other changes.
