removed wp-content
merge
ignore wp-content and wp