rolled back DB and edited Gemfile for duplications
merged files