Update manual
FIX conflicts