loader
Conflict resolution