org.openstreetmap.josm.data.conflict
Interfaces 
IConflictListener
Classes 
Conflict
ConflictCollection