add chao
merge whith no-ff