Fix modulestore merge conflict with heartbeat.