fileA

New line at the top
This is fileA getting it's first line

I just made a second change to file a
Making a conflicting change on branchA

Branch B's change that will work nicely
I'm making a change to be stashed'
This is a line at the bottom
I just made a second change to file a
Making a conflicting change on branchA

Branch B's change that will work nicely
I'm making a change to be stashed'
I just made a second change to file a
Making a conflicting change on branchA

Branch B's change that will work nicely
I'm making a change to be stashed'