merged ray
1. update chat 2. update alarm
merge remote origin