make this branch the same as master

I want to see if I can make test_branch1 the same as the master