client now diff updates
 fixed conflict