User blog comment:Dylansworld/What happened./@comment-26260479-20160221014847

I guess the conflict's been resolved, then. And also, it's 13, not 12. ;)