cfd74b6 solve unsolved merge conflict

Authored and Committed by Alexis Lameire 11 years ago
    solve unsolved merge conflict