Merge conflict resolved ()
Removed some plain text
mysql password changed - ADD YOURS