Learning conflict resolution
Removed conflicts