Fixing merge messages