First attempt at conflict detection in local merge.

No tests yet.