doc started
conflict solved