Merge 2 setup