Improves merge message management