Tentando arrumar as coisas
Resolvendo conflitos entre Gemfile branch 'master' of github.com:krlsdu/FarmaciaEstoque
Ajustando as coisas