fixed merge error in wp-config