Shouldn't trunk/gcc/ChangeLog be rotated for the new year? Also, there is a conflict marker introduced in 182938.