fix news/indexes for firefox
fix merge conflict in database.yml