ex2 merge
removed tempfiles