Removing merge conflict markers that I'd accidentally included in the last commit :-)