initialized gem
resolve merge conflicts