do noti and popup
try to fix conflicts
fix all the conflict