remove Gemfile.orig from merge conflict