removed pesky Gemfile conflicted copy.lock file