test for should be conflicting text
fix expected result to be the actual expected result
fix pop vs shift bug
Merge pull request #7 from GoBoundless/diffing_error

RFR: Diffing error