lib6
merge