typo error
typo error
modified database.yml.example
typo error
Merged confiict