merge magic

merge magic