Code examples, .gitignore
fix conflict