Yes - please don't delete this. Looks like a merge conflict.