df0e53f Fix merge conflicts

Merged and Committed by ovasik 9 years ago
    Fix merge conflicts
    
        
file modified
+6 -1