Merge "Count subject and talk page conflict separately"