Untracking database.yml file
Untracking database.yml file
Fixing Merge Issue