Update to latest aldryn-blog, fix merge conflict