Fix merge message to not have '
Merge pull request #6686503 from jingweno/fix_merge_message

Fix merge message to not have '