merge client_common and client_template