Fix merge conflict on database.yml