Refactor MessageFormatter for "merged" events