0.8.13.53: LESS SPURIOUS CONFLICTS