Git forgot some stuff during the merge.