working on merging client