Fix merge conflicts

Products.java

@@ -849,7 +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",
@@ -888,9 +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)
+    	return new Product("A ball for soccer", "used for playing... soccer", "soccerball.jpg", "a..soccer..ball", 10000.0);
+
     }
 }