a242c2f fix handling of conflicts

Authored and Committed by mclasen 16 years ago
    fix handling of conflicts
    
        
file added
+29
file modified
+8 -2