Changes included changing name is App.js from Sami to Trevor in helloWorld branch. Also merged commits from Sami's newText branch to main and resolved merge conflicts by rebasing. Finally, created new branch called "newBranch" and bumped the npm version to 1.0.1 and then created a PR to main to update the npm version there as well.