diff --git a/Products.java b/Products.java
index 7056ed033b61c0df4cc40e46f36e91453e48bf8f..1b2bb2aefdd5514a6a89066738a0c9256d331631 100644
--- a/Products.java
+++ b/Products.java
@@ -110,6 +110,7 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+<<<<<<< HEAD
     public Product yixuan19Product(){
     	return new Product (
 		"Goomba",
@@ -117,6 +118,15 @@ public class Products { /* a good class, but not as good as cse391 */
 		"Avatar.png",
 		"Picture of Gawr Gura",
 		114514.0
+=======
+    public Product skuttyProduct() {
+	return new Product(
+	    "Rake",
+	    "A rake to gather leaves",
+	    "rake.jpg",
+	    "image of a rake",
+	    5959.59
+>>>>>>> skutty_staff_page
 	);
     }
 }
diff --git a/Staff.java b/Staff.java
index cc8d002343f5dd0d4133c245ec1bb0ce52e47785..c66bc0089ed8ffdbec3328f0da0dc1060dda04b1 100644
--- a/Staff.java
+++ b/Staff.java
@@ -137,5 +137,14 @@ public class Staff {
 		"Goomba.jpg",
 		"Shaaaaaaaaark"
 	);   
+
+    public Employee skutty() {
+        return new Employee(
+	    "Sriram",
+	    "Student",
+	    "sleeping",
+	    "cake.jpg",
+	    "cake"
+        );
     }
 }