heartbeat service
merge