Added client server data synce
resolved merge conflict