Makes a change
Makes a different change
Fixes merge conflict