63d7f5c fix merge conflicts

Merged and Committed by pnemade 8 years ago
    fix merge conflicts
    
        
file modified
+12 -13