Update documentation for proposed option.
Add 'conflicted' status to file and properties.
Check for conflicts after a merge, and implement auto merge commit message.
Merge branch 'auto-merge' into develop.