0b22ca Fix conflicts handling

Authored and Committed by mclasen 12 years ago
    Fix conflicts handling
    
        
file added
+29
file modified
+8 -2