fixed problem with missing WP directory
Fixed conflicts