Doc: merged
confl solved