updated algorithm to not conflict when left and right changes are identical
fix typo
use the assigned variable just made
Merge pull request #1 from GoBoundless/add_conflicts

Add conflicts