7648df7 Fix conflicts.

Merged and Committed by hobbes1069 6 years ago
    Fix conflicts.
    
        
file modified
+6 -0