fixed snipmate conflicts