solved conflict snippets