Starting today, Kumu supports a robust merge conflict process that makes collaborating with others easier.
When you and your teammates are working at the same time, we don't want either of you to lose your changes. If there's a conflict, Kumu will now try to automatically merge the changes in the background. If we need your help we'll prompt you with the differences -- just cherry pick the parts you want to keep and you're all set.
Check out the new help guide on conflicts for more details. And if you're feeling adventurous, invite a friend to a conflict party and give the new merge process a test run.