Bad merge on that file ignore changes on it.