conflict resolution
 
Glassware