deleted wp-config.php and added .gitignore
Fixing and conclude merge conflicts
modify .gitignore
fixing .gitignore