Missed merge conflict. It's been too long since I've used git!