commit to merge client
resolve minor conflict