Merge of file header Changelog

I'm working on source code dating back several years, before the more advanced version control systems like bazaar were invented. As such each file has a 'Changelog' style section at the top, detailing what was modified in the last change. Legacy process dictates that we keep this up to date.

i.e.,

/**
 * Change activity:
 *
 * Reason Date Origin Description
 * --------------- ------ -------- --------------------------------------------
 * 123456 080508 tonik Send format 1.2 xml
 * 123457 080509 dnwe Emit publications on completion of work.
 * 123458 080514 peters Swap in new sort algorithm
 * =============================================
 */

However, when merging from branches, this always causes a conflict (admittedly, trivial to resolve but requires manual intervention) as both people have inserted a change line above the === line.

Is there a way of getting these to automatically merge without conflict? It doesn't really matter in which order they appear, although sorted by timestamp of original commit would be optimal.