Expanded 3
conflict solved