wordcount conflict fix