diff --git a/opm/simulators/wells/RateConverter.hpp b/opm/simulators/wells/RateConverter.hpp
index 3141d7faf..dcda1bdca 100644
--- a/opm/simulators/wells/RateConverter.hpp
+++ b/opm/simulators/wells/RateConverter.hpp
@@ -496,20 +496,48 @@ namespace Opm {
                     if (hydrocarbonPV > 0.) {
                         auto& attr = attributes_hpv[reg];
                         attr.pv += hydrocarbonPV;
+<<<<<<< HEAD
                         attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
                         attr.rs += fs.Rs().value() * hydrocarbonPV;
                         attr.rv += fs.Rv().value() * hydrocarbonPV;
                         attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
+=======
+                        if (Details::PhaseUsed::oil(pu)) {
+                            attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
+                            attr.rs += fs.Rs().value() * hydrocarbonPV;
+                            attr.rv += fs.Rv().value() * hydrocarbonPV;
+                            attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * hydrocarbonPV;
+                        }
+                        else{
+                            assert(Details::PhaseUsed::gas(pu));
+                            attr.pressure += fs.pressure(FluidSystem::gasPhaseIdx).value() * hydrocarbonPV;
+                            attr.temperature += fs.temperature(FluidSystem::gasPhaseIdx).value() * hydrocarbonPV;
+                        }
+>>>>>>> 75076d46d... fix for the situation that hydrocarbon consist only of gas
                         attr.saltConcentration += fs.saltConcentration().value() * hydrocarbonPV;
                     }
 
                     if (pv_cell > 0.) {
                         auto& attr = attributes_pv[reg];
                         attr.pv += pv_cell;
+<<<<<<< HEAD
                         attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * pv_cell;
                         attr.rs += fs.Rs().value() * pv_cell;
                         attr.rv += fs.Rv().value() * pv_cell;
                         attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * pv_cell;
+=======
+                        if (Details::PhaseUsed::oil(pu)) {
+                            attr.pressure += fs.pressure(FluidSystem::oilPhaseIdx).value() * pv_cell;
+                            attr.rs += fs.Rs().value() * pv_cell;
+                            attr.rv += fs.Rv().value() * pv_cell;
+                            attr.temperature += fs.temperature(FluidSystem::oilPhaseIdx).value() * pv_cell;
+                        }
+                        else{
+                             assert(Details::PhaseUsed::gas(pu));
+                             attr.pressure += fs.pressure(FluidSystem::gasPhaseIdx).value() * pv_cell;
+                             attr.temperature += fs.temperature(FluidSystem::gasPhaseIdx).value() * pv_cell;
+                        }
+>>>>>>> 75076d46d... fix for the situation that hydrocarbon consist only of gas
                         attr.saltConcentration += fs.saltConcentration().value() * pv_cell;
                     }
                 }