Updated conflicted extension.