Added client for merging (main branch)