Threads merged.

This really sucks, I was very much looking forward to this fight. Hopefully it's only put off for a couple of weeks.