Fixed Json file
Resolved merge conflict in the package.json file by incorporating changes from both branches. Ensured that the resulting package.json file maintains the necessary dependencies, scripts, and configurations.
Resolved merge conflict in the package.json file by incorporating changes from both branches. Ensured that the resulting package.json file maintains the necessary dependencies, scripts, and configurations.