diff --git a/com/laboon/Cell.java b/com/laboon/Cell.java
index 1e0eab8..3face93 100644
--- a/com/laboon/Cell.java
+++ b/com/laboon/Cell.java
@@ -67,6 +67,18 @@ public State iterate(int numNeighbors) {
      * @return Character representation of the cell's state
      */
 	
+<<<<<<< HEAD
+	public char getStateRep() {
+		char toReturn = ' ';
+		if (_state == State.DEAD) {
+			toReturn = '.';
+		} else if (_state == State.ALIVE) {
+			toReturn = 'X';
+		} else {
+			toReturn = '?';
+		}
+		return toReturn;
+=======
     public char getStateRep() {
 	char toReturn = ' ';
 	if (_state == State.DEAD) {
@@ -75,6 +87,7 @@ public char getStateRep() {
 	    toReturn = '*';
 	} else {
 	    toReturn = ' ';
+>>>>>>> master
 	}
 	return toReturn;
     }