bisa dapet notif
merge conflict