diff --git a/Products.java b/Products.java
index 73c242e8c300ee6be68dac8631ff33dae90ba372..9d7e82928d428ce2d71abf9088dc27b639fd9d88 100644
--- a/Products.java
+++ b/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)
     }
 }
diff --git a/Staff.java b/Staff.java
index e319cfa57cbee318f7aa76b0097242b4cf082fc7..90c7cdc9f29165eccae7df573ea90c40b8ef8208 100644
--- a/Staff.java
+++ b/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");
+
     }
 }	
 
diff --git a/images/staff/cars.jpg b/images/staff/cars.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ec986c1a8aa2847e71d29ec1e622eb5f63cb86c8
Binary files /dev/null and b/images/staff/cars.jpg differ
diff --git a/images/staff/soccerball.jpg b/images/staff/soccerball.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..822f016895ab0b09779dbd979d1ff34b7a81efce
Binary files /dev/null and b/images/staff/soccerball.jpg differ