Thread:FranceSwitzerland/@comment-27061647-20170214171059/@comment-33046846-20170216155810

Also, like I said before, I added some conflict badges.