New Winepress: Conflict Resolution