Apparently the cloud version of Microsoft PowerPoint handles conflict resolution with “keep your slide or the other person’s and delete the other one forever,” no “keep both and resolve the difference manually” option. Brilliant. Just brilliant.