workouts a & b
fix merge conflict