passing new/create on exercise
shem merge conflict