cleaned and merging