add online status check
merge conficts