Winepress: Conflict Resolution