Fix merge conflict

cachet/config.go

@@ -4,13 +4,14 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/castawaylabs/cachet-monitor/system"
 	"io"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
 	"os"
+
+	"github.com/castawaylabs/cachet-monitor/system"
 )
 
 // Static config
@@ -23,6 +24,7 @@ var Logger *log.Logger
 type CachetConfig struct {
 	APIUrl      string     `json:"api_url"`
 	APIToken    string     `json:"api_token"`
+	Interval    int64      `json:"interval"`
 	Monitors    []*Monitor `json:"monitors"`
 	SystemName  string     `json:"system_name"`
 	LogPath     string     `json:"log_path"`