Board Thread:General Discussion/@comment-29536927-20170512173907/@comment-5754239-20170520161529

That's a good point. We can leave those alone for now then while we decide what to do. I think it's best to leave that discussion at your thread.

If there are any other conflicts, we can start a new thread looking at those conflicts or we can open a discussion on the category / page talk pages.