Talk:May 2015/@comment-26435797-20160531233956

So the small conflict i had yesterday was removed?