[ADD] neosnippet
[MOD] conflict