added wp to gitignore
merge conflict