merging test2