fixed merge failure
refreshed sniff file