c1731e fix collisions

Authored and Committed by bw 4 years ago
    fix collisions
    
        
file modified
+5 -2
file modified
+2 -2