yes, which is why I've been saying for years the kernel community needs to get better at actual conflict resolution...