I just discovered that Dropbox has not been running on my MBP so today is brought to you by “conflicted copy” with special guest ediff-buffers