done...
conflict solved