Make sure customcode can proceed even if it sets the conflict hash but not the "winner"