Commiting to new branch testing
Committing file2 to testing"
Changes to file1 on master
Committing all modified files before merging