fixed snipmate
fixed merge