This is something that is going to create a conflict
Merge?
This should be in my branch1 but not my master branch
This is the master branch commit
This should merge two branches