package.JSON

conflict fix