Add test, realtime send notification
fix conflix
fix conflix