little repairs
conflict solved