ksnippets got blasted by merge