Added snifferrc
Merge is fixed