Merging unit pushed to the server

Merging unit pushed to the server and client was made thinner. This
change enabled interaction of more than 2 devices. 5 devices were
collaborated together to test