move client side to private
remove merge