merged excercise files