Clarify some small parts in s_sndnew.c
Resolve merge conflicts in s_sndnew.c