I'm concerned about the potential for merge conflicts here, but I don't think there's anything else we can do.