check for merge conflicts

currently Travis should fail on this, due to 2 such merge conflicts in libmscore/clef.cpp