Server

added client for merge.