I think they're just retcon'ing Merlyn.http://blastr.com/assets_c/2012/11/arrowset5-thumb-550x366-106014.jpeg