merging addthis changes