resolve conflict and undelete Gemfile
resolve conflict and undelete Gemfile