Conflicts between branches test - BRANCHBRANCH

This is to test how conflicts are handled while merging. I will edit
something in the new branch, and delete it in the master.

This is the master with BRANCHBRANCH

-In master I will have BRANCHBRANCH in the readme
-I will then make a new branch
-In that branch I will add a dash between BRANCHBRANCH
-In the master I will delete BRANCHBRANCH
-I will then merge the branch to the master