Ignore files for upgrade, for example you could add /etc/motd here. Simply edit the file /etc/mergemaster.rc and add the following line:
# Automatically install files that do not exist on the system already
# Automatically upgrade files that have not been user modified
# Preserve files that you replace
# Files to always avoid comparing (space separated)
For more information check out the manual page.