This looks like an extraneous change from a bad merge.