Many developers add a "history" field in their applications to document when/who updated a document and what happened.
This prevents the "Conflict Handling" form property "Merge Conflicts" option from working as there could always be a difference in this field even if otherwise the document could be merged.
To improve merging and reduce conflicts add a field option for merging
options should be:
1) "ignore differences" in this field when merging documents. The winning document's field is used.
2) "merge field contents" - The contents of the field are merged. An entry is added to show the merge happened. Field contents would have to be in a specified format e.g. dd-mmm-yyy hh:mm:ss username - history text
3) a default option to work as it does now
Maybe a new "document history" field type would help resolve this situation. When entries are appended via LotusScript or @Formula the date and time and username are automatically prepended.