ChangeLog Merge fix