change to merge 2