Added automatic conflict resolution.