conflict resolution
 
Caps