Resolve Conflicts

3 files changed, 3 insertions, 3 deletions

diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go
index 36ae2aa85..6925c04e0 100644
--- a/go/storage/needle_read_write.go
+++ b/go/storage/needle_read_write.go
@@ -35,7 +35,7 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) {
 				}
 			}(s, end)
 		} else {
-			err = fmt.Errorf("Cnnot Read Current Volume Position: %v", e)
+			err = fmt.Errorf("Cannot Read Current Volume Position: %v", e)
 			return
 		}
 	}
diff --git a/go/storage/store.go b/go/storage/store.go
index 65eed1d0e..7e2b23058 100644
--- a/go/storage/store.go
+++ b/go/storage/store.go
@@ -64,7 +64,7 @@ func (mn *MasterNodes) findMaster() (string, error) {
 		}
 	}
 	if mn.lastNode < 0 {
-		return "", errors.New("No master node avalable!")
+		return "", errors.New("No master node available!")
 	}
 	return mn.nodes[mn.lastNode], nil
 }
diff --git a/go/storage/volume.go b/go/storage/volume.go
index 46d41dc2b..6ef72cfcd 100644
--- a/go/storage/volume.go
+++ b/go/storage/volume.go
@@ -175,7 +175,7 @@ func (v *Volume) write(n *Needle) (size uint32, err error) {
 	}
 	var offset int64
 	if offset, err = v.dataFile.Seek(0, 2); err != nil {
-		glog.V(0).Infof("faile to seek the end of file: %v", err)
+		glog.V(0).Infof("failed to seek the end of file: %v", err)
 		return
 	}