Unsure what changes... probably minor?
conflict solved