Remove merge conflict left-over from clef.cpp:

it turned out if was simply a matter of removing the code 'commented out' with `#if 0` -- `#else`.
Merge pull request #994 from mgavioli/Remove_merge_conflict_leftover_from_clef_cpp

Remove merge conflict left-over from clef.cpp