corrected merge to latest snapshot version