db6768 fixed merge conflict

Merged and Committed by John Khvatov 8 years ago
    fixed merge conflict
    
        
file modified
+3 -0