Title: Sharp and diffuse fronts in oil reservoirs: front tracking and capillarity