Slight updates
Client updates- Recovery from the conflict