deleted gemfile to fix merge conflict