Conflicts log

edit

So far I had no conflicts, until I created the article: