merging 2.1