Cannot mark reply as "solution" after merger

[davidb]

Hi Silas, this should now be fixed with this commit and deployed to your site already.