Update manual
merge conflict