adding code blocks
fix conflict