Merge "Track which namespaces edit conflicts are resolved in"