diff --git a/README.md b/README.md
index fe7f22a..b517bf6 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ Not seeking contribution at this time.
 ## Authors
 
 - **Ernest Phillips** -
+Collaborated with @erndevelops
 
 ## License
 
diff --git a/app/workout/workout.model.js b/app/workout/workout.model.js
index 80c41ff..8d8f8b9 100644
--- a/app/workout/workout.model.js
+++ b/app/workout/workout.model.js
@@ -57,6 +57,21 @@ workoutSchema.methods.serialize = function() {
 const Workout = mongoose.model("workout", workoutSchema);
 
 const WorkoutJoiSchema = Joi.object().keys({
+<<<<<<< HEAD
+  user: Joi.string().optional(),
+  exercise: Joi.string()
+    .min(1)
+    .required(),
+  reps: Joi.number()
+    .min(1)
+    .required(),
+<<<<<<< HEAD
+  weight: Joi.number().min(1)
+=======
+  weight: Joi.number().min(1),
+  date: Joi.date()
+>>>>>>> c67b88e6bca7463a4270d6b72836ffa09870c8f9
+=======
     user: Joi.string().required(),
     sets: Joi.object({
         exercise: Joi.string(),
@@ -65,6 +80,7 @@ const WorkoutJoiSchema = Joi.object().keys({
         weight: Joi.number()
     }),
     date: Joi.date().min('1-1-1980')
+>>>>>>> master
 });
 
 module.exports = {
diff --git a/start.js b/start.js
index f2a1d02..36f0d18 100644
--- a/start.js
+++ b/start.js
@@ -2,4 +2,6 @@ const {
     startServer
 } = require('./app/server');
 
-startServer();
\ No newline at end of file
+startServer();
+
+//HEre is a comment from @erndevelops