I don't think this and a few other changes to this file were not made by you, so it looks like a bad merge.