So, I added a conflict line for giggles
Here is my comment created in extraBranch
e Please enter the commit message for your changes. Lines starting
New file in master
new file in extrabranch
final merged file