• No, nobody is resolving the conflicts manually.