add Change {1,2}
add Change 3
add Change {1,2}
add Change 3
Merge branch 'rebase' of github.com:maxmurdoch/git-practice into rebase