diff --git a/Products.java b/Products.java
index 3b962249157654f5247979b02c5e446661fc0fc0..69f8bd0f55696d6213054ede61444d1c03f04cf0 100644
--- a/Products.java
+++ b/Products.java
@@ -13,6 +13,16 @@ public class Products { /* a good class, but not as good as cse391 */
 
     
 
+    public Product smayanProduct() {
+        return new Product(
+                "Dollar Bill",
+                "one dollar in cash",
+                "dollar_bill.jpg",
+                "Image of a one-dollar bill",
+                1.00
+                );
+    }
+
     public Product benoreProduct() {
 	    return new Product(
 			    "Taylor Swift - Folklore Vinyl",
@@ -31,8 +41,19 @@ public class Products { /* a good class, but not as good as cse391 */
 		    "Lazy egg",
 		    1000.0
 		    );
+
     }
 
+       public Product bohanz04Product() {
+            return new Product(
+                            "CSE351 hw problem",
+                            "A confusing problem faced",
+                            "test2.jpg",
+                            "image of that problem",
+                            1.00
+                            );
+    }
+ 
     public Product kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",
@@ -806,6 +827,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		1000.0
 	);
     }
+<<<<<<< HEAD
     public Product aagateProduct() {
     	return new Product(
 		"Meta quest",
@@ -814,5 +836,26 @@ public class Products { /* a good class, but not as good as cse391 */
 		"A meta quest 3 on Amazon",
 		9.00
 	);
+=======
+
+	public Product acuraIntegra() {
+        return new Product (
+            "Acura Integra",
+            "Acura Integra",
+            "acura.jpg",
+            "Acura Integra",
+			52400
+		);
+	}
+	
+    public Product shangy24Product() {
+        return new Product(
+            "Windows 10 Pro",
+            "An operating system made by Microsoft",
+            "win10.jpg",
+            "Windows 10 Default Wallpaper",
+            199.99
+        );
+>>>>>>> origin/main
     }
 }
diff --git a/Staff.java b/Staff.java
index 674988819238a7aa8111466ded976f7718e21bf5..a356e8934728f120f9420ba18a1178d5508535b9 100644
--- a/Staff.java
+++ b/Staff.java
@@ -1,6 +1,17 @@
 public class Staff {
 
 
+    public Employee smayan(){
+           return new Employee(
+                           "Smayan Nirantare",
+                           "CS Student",
+                           "I'm hungry",
+                           "travis_scott.jpg",
+                           "Travis Scott"
+                           );
+   }
+
+
    public Employee boschen() {
    	return new Employee(
 		"Boshan Chen",
@@ -29,6 +40,16 @@ public class Staff {
    }
 	
 
+   public Employee bohanz04() {
+        return new Employee(
+	    "Bryan Zhao",
+	    "Student",
+	    "abcdefg stuff",
+	    "test1.jpg",
+	    "hope to get internship"
+	);
+   }	   
+
    public Employee cuperido() {
        return new Employee(
            "Young You",
@@ -826,6 +847,7 @@ public class Staff {
                 "celsius picture"
         );    
     }
+<<<<<<< HEAD
     public Employee aagate() {
     	return new Employee(
 	    "Arohan",
@@ -834,6 +856,27 @@ public class Staff {
 	    "sloth.jpg",
 	    "picture of a sloth"
 	);
+=======
+
+    public Employee kristong() {
+        return new Employee (
+            "Kris",
+            "Student",
+            "Hello",
+            "boy.jp",
+            "🙏"
+        );
+    }
+
+    public Employee shangy24() {
+        return new Employee(
+            "Shangzhen Yang",
+            "Student",
+            "Hello, World!",
+            "your-name.jpg",
+            "Wallpaper of Movie Your Name"
+        );
+>>>>>>> origin/main
     }
 }	
 
diff --git a/images/products/acura.jpg b/images/products/acura.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..17502134e99794c51ee037b4d91b45fd2942bf85
Binary files /dev/null and b/images/products/acura.jpg differ
diff --git a/images/products/dollar_bill.jpg b/images/products/dollar_bill.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9e5a9ec1f6e39cce8382ff6d59536ac016aa52e2
Binary files /dev/null and b/images/products/dollar_bill.jpg differ
diff --git a/images/products/test2.jpg b/images/products/test2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..20cdab1ea00dea217026843230381259fa42fa79
Binary files /dev/null and b/images/products/test2.jpg differ
diff --git a/images/products/win10.jpg b/images/products/win10.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6d0698b8fcc5b4530228013e56543508e803ea78
Binary files /dev/null and b/images/products/win10.jpg differ
diff --git a/images/staff/boy.jpg b/images/staff/boy.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..265268e2ee4615dc07007592a793338d956fc2d8
Binary files /dev/null and b/images/staff/boy.jpg differ
diff --git a/images/staff/test1.jpg b/images/staff/test1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..20cdab1ea00dea217026843230381259fa42fa79
Binary files /dev/null and b/images/staff/test1.jpg differ
diff --git a/images/staff/travis_scott.jpg b/images/staff/travis_scott.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3bc0dd8bb92a95cd9646fc7e2d4f2dfde442e269
Binary files /dev/null and b/images/staff/travis_scott.jpg differ
diff --git a/images/staff/your-name.jpg b/images/staff/your-name.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8b25e1e4c366a016229604c8f51936e6a49b00ee
Binary files /dev/null and b/images/staff/your-name.jpg differ