[nw10] fix merge
[nw10] disable nwsnapshot for now