merge with demon

merge with demon