Fix merging conflicts client
Fix merging conflicts server