new version of testing
fixed merge