powerSpecTest0718 - commit before merge
fix conflict