FIX: Merge conflict not resolved in snippets.cson