Fix merge conflicts

Products.java

@@ -849,6 +849,7 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+<<<<<<< HEAD
    public Product mshumaProduct() {
         return new Product(
                 "Violin Mutes 100 pack",
@@ -887,5 +888,9 @@ public class Products { /* a good class, but not as good as cse391 */
             "Windows 10 Default Wallpaper",
             199.99
         );
+=======
+    public Product sirjan1Product() {
+    	return new Product("A ball for soccer", "used for playing... soccer", "soccerball.jpg", "a..soccer..ball", 10000);
+>>>>>>> 5158523 (Added my method to Products.java and Staff.java)
     }
 }

Staff.java

@@ -869,6 +869,7 @@ public class Staff {
                 "celsius picture"
         );    
     }
+
     public Employee mshuma() {
         return new Employee(
                 "Mariana",
@@ -906,6 +907,12 @@ public class Staff {
             "your-name.jpg",
             "Wallpaper of Movie Your Name"
         );
+
+
+   
+    public Employee sirjan1() {
+   	return new Employee("Sirjan", "Student", "Lost", "cars.jpg", "carring");
+
     }
 }