Testing something with rebasing - 2.
Merge branch 'master' of github.com:abztrakt/git-practice
Causing a merge conflict for Ali.