merge with client module
update repo