Removed database.yml passwords
Fixed merge conflict