fix merge, paths for packager