Manually resolved conflicts in: opm/core/props/BlackoilPropertiesFromDeck.cpp opm/core/wells/WellsManager.cpp