Squashed conflicts