Some changes
conflict solved