finally decided to not include client
merging