Resolved Heartbeat file conflict