conflicts are reduced now
client has to redo undone changes