Wasn't there some sort of joke about programming languages where merge conflicts are still valid code?