Remove mistakenly committed git rebase artefacts

My bad. I committed these in 8271e7cfae3bf6b533567492641002806f264d60.