finished ex1 and change merge other exercises