update
sorted conflict and added wp-config.php to ignore