#22: merge conflict failure fixed; duplicate method #testSkip removed