Upwinding and artificial viscosity for robust discontinuous Galerkin schemes of two-phase flow in mass conservation form