more snippets
fixe merge fail