removed wp-config
merge