remove merge confusing from sndnvaps/dev