clent modify
merge thing