Added conflictstyle
Run gofmt after save a go file
Added GOPATH to vim path