:lipstick: Use non-matching group in CONFLICT_REGEX