update merge errors

packages size may be adding more issues with this merge update...