final merge 2