fix wp_config conflict
Merge branch 'fix-conflict'