fix errors in packages and smart.json/lock from previous merge conflict