Testing some fixes to get conflict resolution working.