Job 1 name change
Added pipeline definition for exercise-05
Fix merge conflict