work on exercise 1
trying to resolve conflict