Exclude learned from tracked files
gitignore conflict resolved
Merge branch 'wp/refactoring/18'