Conflicts: opm/parser/eclipse/EclipseState/EclipseState.cpp opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp