Problematic Message Merging fixed