WD second commit
Fixed .gitignore conflicts