ignoring file with database password
getting rid of old DB password
merging