fixed conflict ruby snippets.