c3d15f9 fix merge conflicts

Merged and Committed by tdawson 10 years ago
    fix merge conflicts
    
        
file modified
+5 -1