fixed merge addons