add exercise 1
fix conflicts